Merge pull request #9993 from pchote/nsprocess-fix

Switch to a (hopefully) working NSProcess url.
2015-11-14 22:52:56 +01:00 · 2015-11-14 21:47:21 +00:00 · 2015-11-14 22:10:40 +01:00 · 2015-11-14 22:10:40 +01:00 · 2015-11-14 22:10:40 +01:00 · 2015-11-14 22:10:40 +01:00
1632 changed files with 74157 additions and 36031 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -28,22 +28,8 @@ mods/*/*.mdb
 /*.pdb
 /*.mdb
 /*.exe
-thirdparty/StyleCop*
-thirdparty/ICSharpCode.SharpZipLib.dll*
-thirdparty/MaxMind*
-thirdparty/RestSharp*
-thirdparty/Newtonsoft.Json*
-thirdparty/SharpFont*
-thirdparty/windows/freetype6.dll
-thirdparty/nunit*
-thirdparty/windows/SDL2.dll
-thirdparty/Mono.Nat.dll
-thirdparty/Moq.dll
-thirdparty/nuget.exe
-thirdparty/windows/lua51.dll
-thirdparty/windows/zlib1.dll
-thirdparty/windows/soft_oal.dll
-thirdparty/FuzzyLogicLibrary.dll
+thirdparty/download/*
+*.mmdb.gz

 # backup files by various editors
 *~
@@ -76,6 +62,7 @@ OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
 DOCUMENTATION.md
 Lua-API.md
 *.html
+openra.6

 # StyleCop
 *.Cache
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,21 +2,37 @@
 # see travis-ci.org for details

 language: csharp
+mono: 4.0.0

-# Use the Docker-based infrastructure
+# http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
-cache: apt
+
+cache:
+  directories:
+  - thirdparty/download
+
+addons:
+  apt:
+    packages:
+    - lua5.1
+    - nsis
+    - nsis-common
+    - dpkg
+    - markdown

 # Environment variables
 env:
  secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="

+# Fetch dependencies
 # Run the build script
-# call RALint to check for YAML errors
+# Check source code with StyleCop
+# call OpenRA to check for YAML errors
 script:
- - travis_retry make cli-dependencies
+ - travis_retry make all-dependencies
 - make all
 - make check
+ - make check-scripts
 - make test

 # Automatically update the trait documentation and Lua API
@@ -29,6 +45,7 @@ branches:
   - /^release-.*$/
   - /^playtest-.*$/
   - /^pkgtest-.*$/
+   - /^prep-.*$/
   - bleed

 # Notify developers when build passed/failed.
@@ -52,6 +69,7 @@ deploy:
  api_key:
    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
  file:
+    - build/OpenRA-${TRAVIS_TAG}.exe
    - build/OpenRA-${TRAVIS_TAG}.zip
    - build/openra_${DOTVERSION}_all.deb
  skip_cleanup: true
--- a/28
+++ b/28
@@ -3,19 +3,24 @@ hard work of many contributors.

 The OpenRA developers are:
    * Chris Forbes (chrisf)
-    * Curtis Shmyr (hamb)
+    * Igor Popov (ihptru)
+    * Lukas Franke (abcdefg30)
    * Matthias Mailänder (Mailaender)
    * Oliver Brakmann (obrakmann)
    * Paul Chote (pchote)
-    * ScottNZ
+    * Pavel Penev (penev92)
+    * Reaperrr
+    * Tom Roostan (RoosterDragon)

 Previous developers included:
    * Alli Witheford (alzeih)
    * Caleb Anderson (RobotCaleb)
+    * Curtis Shmyr (hamb)
    * Daniel Hernandez (Mancano)
    * Megan Bowra-Dean (beedee)
    * Mike Bundy (kehaar)
    * Robert Pepperell (ytinasni)
+    * ScottNZ

 Also thanks to:
    * Adam Valy (Tschokky)
@@ -30,44 +35,53 @@ Also thanks to:
    * Arik Lirette (Angusm3)
    * Barnaby Smith (mvi)
    * Bellator
+    * Biofreak
    * Braxton Williams (Buddytex)
+    * Bryan Wilbur
    * Bugra Cuhadaroglu (BugraC)
    * Christer Ulfsparre (Holloweye)
    * Chris Grant (Unit158)
+    * clem
    * Cody Brittain (Generalcamo)
    * D2k Sardaukar
+    * D'Arcy Rush (r34ch)
    * Daniel Derejvanik (Harisson)
    * Danny Keary (Dan9550)
    * David Jiménez (Rydra)
    * David Russell (DavidARussell)
    * DeadlySurprise
+    * Dmitri Suvorov (suvjunmd)
    * Erasmus Schroder (rasco)
    * Eric Bajumpaa (SteelPhase)
+    * Evgeniy Sergeev (evgeniysergeev)
    * Fahrradkette
    * Frank Razenberg (zzattack)
    * Gareth Needham (Ripley`)
+    * Glen Anderson (GlenAnderson)
    * Glenn Martin Jensen (Baxxster)
    * Gordon Martin (Happy0)
    * Guido Lipke (LipkeGu)
+    * Gyula Zimmermann (Graion Dilach)
+    * Hervé Matysiak (Herve-M)
    * Huw Pascoe
    * Ian T. Jacobsen (Smilex)
-    * Igor Popov (ihptru)
    * Imago
    * Iran
    * Jacob Dufault (jacobdufault)
    * James Dunne (jsd)
+    * James Gilbert (DSUK)
    * Jan-Willem Buurlage (jwbuurlage)
    * Jason (atlimit8)
    * Jeff Harris (jeff_1amstudios)
    * Jes
    * Joakim Lindberg (booom3)
+    * Joppy Furr
    * Kanar
    * Kenny Hoxworth (hoxworth)
    * Krishnakanth Mallik
    * Kyrre Soerensen (zypres)
    * Lawrence Wang
    * Lesueur Benjamin (Valkirie)
-    * Lukas Franke (abcdefg30)
    * Maarten Meuris (Nyerguds)
    * Mark Olson (markolson)
    * Matija Hustic (matija-hustic)
@@ -85,13 +99,11 @@ Also thanks to:
    * Olaf van der Spek
    * Paolo Chiodi (paolochiodi)
    * Paul Dovydaitis (pdovy)
-    * Pavel Penev (penev92)
    * Pavlos Touboulidis (pav)
    * Pizzaoverhead
    * Psydev
    * Raymond Bedrossian (Squiggles211)
    * Raymond Martineau (mart0258)
-    * Reaperrr
    * Riderr3
    * Rikhardur Bjarni Einarsson (WolfGaming)
    * Sascha Biedermann (bidifx)
@@ -102,7 +114,6 @@ Also thanks to:
    * Teemu Nieminen (Temeez)
    * Tim Mylemans (gecko)
    * Tirili
-    * Tom Roostan (RoosterDragon)
    * Tristan Keating (Kilkakon)
    * Tristan Mühlbacher (MicroBit)
    * Vladimir Komarov (VrKomarov)
@@ -146,6 +157,9 @@ Motmans and distributed under the MIT license.
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.

+Using SmartIrc4Net developed by Mirco Bauer
+distributed under the LGPL version 2.1 or later.
+

 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,10 @@

 * Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?
 * Add the appropriate log files on crashes.
+* Mention the version you have tested against.
 * Please be specific on how to reproduce the problem.
+* Do not submit duplicate issues. Search first.
+* Avoid including multiple requests/bugs into a single issue.

 ## Patches

--- a/GeoLite2-Country.mmdb
+++ b/GeoLite2-Country.mmdb
--- a/203
+++ b/203
@@ -1,10 +1,10 @@
 ############################# INSTRUCTIONS #############################
 #
 # to compile, run:
-#   make
+#   make [DEBUG=false]
 #
 # to compile with development tools, run:
-#   make all
+#   make all [DEBUG=false]
 #
 # to check the official mods for erroneous yaml files, run:
 #   make test
@@ -22,7 +22,7 @@
 #   make [prefix=/foo] [bindir=/bar/bin] install-all
 #
 # to install Linux startup scripts, desktop files and icons:
-#   make install-linux-shortcuts
+#   make install-linux-shortcuts [DEBUG=false]
 #
 # to uninstall, run:
 #   make uninstall
@@ -38,9 +38,17 @@
 ############################## TOOLCHAIN ###############################
 #
 CSC         = dmcs
-CSFLAGS     = -nologo -warn:4 -debug:full -optimize- -codepage:utf8 -unsafe -warnaserror
-DEFINE      = DEBUG;TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll thirdparty/FuzzyLogicLibrary.dll thirdparty/Mono.Nat.dll thirdparty/MaxMind.Db.dll thirdparty/MaxMind.GeoIP2.dll thirdparty/Eluant.dll
+CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
+DEFINE      = TRACE
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
+
+DEBUG = true
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
+CSFLAGS   += -debug:pdbonly -optimize+
+else
+CSFLAGS   += -debug:full -optimize-
+DEFINE    := DEBUG;$(DEFINE)
+endif



@@ -50,6 +58,7 @@ COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExte
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 datadir ?= $(datarootdir)
+mandir ?= $(datarootdir)/man/
 bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 gameinstalldir ?= $(libdir)/openra
@@ -70,10 +79,18 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644

 # program targets
-CORE = rsdl2 rnull game utility
-TOOLS = editor crashdialog
+CORE = pdefault pnull game utility
+TOOLS = gamemonitor
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)

+# dependencies
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+os-dependencies = osx-dependencies
+else
+os-dependencies = linux-dependencies
+endif
+


 ######################## PROGRAM TARGET RULES ##########################
@@ -83,32 +100,32 @@ VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)

-# Renderer dlls
-rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
-rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
-rsdl2_KIND = library
-rsdl2_DEPS = $(game_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
+# Platform dlls
+pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
+pdefault_TARGET = OpenRA.Platforms.Default.dll
+pdefault_KIND = library
+pdefault_DEPS = $(game_TARGET)
+pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(pdefault_DEPS)

-rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
-rnull_TARGET = OpenRA.Renderer.Null.dll
-rnull_KIND = library
-rnull_DEPS = $(game_TARGET)
-rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
-PROGRAMS += rsdl2 rnull
-renderers: $(rsdl2_TARGET) $(rnull_TARGET)
+pnull_SRCS := $(shell find OpenRA.Platforms.Null/ -iname '*.cs')
+pnull_TARGET = OpenRA.Platforms.Null.dll
+pnull_KIND = library
+pnull_DEPS = $(game_TARGET)
+pnull_LIBS = $(COMMON_LIBS) $(pnull_DEPS)
+PROGRAMS += pdefault pnull
+platforms: $(pdefault_TARGET) $(pnull_TARGET)

 # Mods Common
 mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
 mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
 mod_common_KIND = library
 mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/StyleCop.dll thirdparty/StyleCop.CSharp.dll thirdparty/StyleCop.CSharp.Rules.dll
+mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
 PROGRAMS += mod_common
 mod_common: $(mod_common_TARGET)

@@ -130,8 +147,8 @@ mod_ra: $(mod_ra_TARGET)
 mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
 mod_cnc_TARGET = mods/cnc/OpenRA.Mods.Cnc.dll
 mod_cnc_KIND = library
-mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_cnc
 mod_cnc: $(mod_cnc_TARGET)

@@ -139,8 +156,8 @@ mod_cnc: $(mod_cnc_TARGET)
 mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
 mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
 mod_d2k_KIND = library
-mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_d2k
 mod_d2k: $(mod_d2k_TARGET)

@@ -148,36 +165,27 @@ mod_d2k: $(mod_d2k_TARGET)
 mod_ts_SRCS := $(shell find OpenRA.Mods.TS/ -iname '*.cs')
 mod_ts_TARGET = mods/ts/OpenRA.Mods.TS.dll
 mod_ts_KIND = library
-mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET)
-mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
+mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
+mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)

-##### Tools #####
-
-# Map Editor
-editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET = OpenRA.Editor.exe
-editor_KIND = winexe
-editor_DEPS = $(game_TARGET) $(mod_common_TARGET)
-editor_LIBS = System.Windows.Forms.dll System.Data.dll System.Drawing.dll $(editor_DEPS) thirdparty/Eluant.dll
-editor_EXTRA = -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-editor_FLAGS = -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
-
-PROGRAMS += editor
-OpenRA.Editor.MapSelect.resources:
-	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
-OpenRA.Editor.Form1.resources:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
-editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+check-scripts:
+	@echo
+	@echo "Checking for Lua syntax errors..."
+	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
+	@luac -p $(shell find lua/* -iname '*.lua')

 check: utility mods
 	@echo
 	@echo "Checking for code style violations in OpenRA.Game..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
 	@echo
-	@echo "Checking for code style violations in OpenRA.Renderer.Null..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Null
+	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Default
+	@echo
+	@echo "Checking for code style violations in OpenRA.Platforms.Null..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Null
 	@echo
 	@echo "Checking for code style violations in OpenRA.GameMonitor..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
@@ -197,12 +205,6 @@ check: utility mods
 	@echo "Checking for code style violations in OpenRA.Mods.TS..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
 	@echo
-	@echo "Checking for code style violations in OpenRA.Editor..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Editor
-	@echo
-	@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
-	@echo
 	@echo "Checking for code style violations in OpenRA.Utility..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
 	@echo
@@ -240,7 +242,7 @@ utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
 utility_TARGET = OpenRA.Utility.exe
 utility_KIND = exe
 utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
+utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
 PROGRAMS += utility
 utility: $(utility_TARGET)

@@ -271,47 +273,62 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

 ########################## MAKE/INSTALL RULES ##########################
 #
-default: cli-dependencies core
+default: core

-core: game renderers mods utility
+core: game platforms mods utility

-tools: editor gamemonitor
+tools: gamemonitor

-package: cli-dependencies core editor gamemonitor docs version
+package: all-dependencies core tools docs version

 mods: mod_common mod_ra mod_cnc mod_d2k mod_ts

-all: cli-dependencies core tools
+all: dependencies core tools

 clean:
-	@-$(RM_F) *.exe *.dll ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 	@-$(RM_RF) ./*/bin ./*/obj
+	@-$(RM_RF) ./thirdparty/download

 distclean: clean

-dependencies: cli-dependencies native-dependencies
+cli-dependencies:
+	@./thirdparty/fetch-thirdparty-deps.sh
+	@ $(CP_R) thirdparty/download/*.dll .
+	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ $(CP) thirdparty/SDL2-CS.dll.config .
+
+linux-dependencies: cli-dependencies linux-native-dependencies
+
+linux-native-dependencies:
+	@./thirdparty/configure-native-deps.sh

 windows-dependencies:
-	cd thirdparty && ./fetch-thirdparty-deps-windows.sh && cd ..
+	@./thirdparty/fetch-thirdparty-deps-windows.sh

-cli-dependencies:
-	cd thirdparty && ./fetch-thirdparty-deps.sh && cd ..
-	@ $(CP_R) thirdparty/*.dll .
-	@ $(CP_R) thirdparty/*.dll.config .
+osx-dependencies: cli-dependencies
+	@./thirdparty/fetch-thirdparty-deps-osx.sh
+	@ $(CP_R) thirdparty/download/osx/*.dylib .
+	@ $(CP_R) thirdparty/download/osx/*.dll.config .

-native-dependencies:
-	@./configure
+dependencies: $(os-dependencies)
+	@./thirdparty/fetch-geoip-db.sh
+	@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .

-version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
+all-dependencies: cli-dependencies windows-dependencies osx-dependencies
+
+version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml
 	@for i in $? ; do \
 		awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \
 		mv -f $${i}.tmp $${i} ; \
 	done

-# Documentation (d2k depends on all mod libraries)
 docs: utility mods version
-	@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
-	@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md
+	@mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md
+	@mono --debug OpenRA.Utility.exe all --lua-docs > Lua-API.md
+
+man-page: utility mods
+	@mono --debug OpenRA.Utility.exe all --man-page > openra.6

 install: install-core

@@ -335,7 +352,7 @@ install-core: default
 	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"

 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
-	@$(INSTALL_DATA) "GeoLite2-Country.mmdb" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb"
+	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
 	@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"

@@ -352,8 +369,9 @@ install-core: default
 	@$(INSTALL_PROGRAM) MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"

-ifeq ($(shell uname),Linux)
+ifneq ($(UNAME_S),Darwin)
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 endif

@@ -364,24 +382,36 @@ install-tools: tools

 install-linux-icons:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
+	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"

 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"

 install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
 	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"

 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"

+install-linux-appdata:
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
+	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+
+install-man-page: man-page
+	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
+	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
+
 install-linux-scripts:
 	@echo "#!/bin/sh" > openra
 	@echo 'cd "$(gameinstalldir)"' >> openra
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
 	@echo 'mono OpenRA.Game.exe "$$@"' >> openra
+else
+	@echo 'mono --debug OpenRA.Game.exe "$$@"' >> openra
+endif
 	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
 	@echo 'then' >> openra
 	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
@@ -393,34 +423,25 @@ install-linux-scripts:
 	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra

-	@echo "#!/bin/sh" >  openra-editor
-	@echo 'cd "$(gameinstalldir)"' >> openra-editor
-	@echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra-editor
-
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-editor.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-editor.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"

 help:
 	@echo to compile, run:
-	@echo \ \ make
+	@echo \ \ make [DEBUG=false]
 	@echo
 	@echo to compile with development tools, run:
-	@echo \ \ make all
+	@echo \ \ make all [DEBUG=false]
 	@echo
 	@echo to check the official mods for erroneous yaml files, run:
 	@echo \ \ make test
@@ -435,7 +456,7 @@ help:
 	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
 	@echo
 	@echo to install Linux startup scripts, desktop files and icons
-	@echo \ \ make install-linux-shortcuts
+	@echo \ \ make install-linux-shortcuts [DEBUG=false]
 	@echo
 	@echo to uninstall, run:
 	@echo \ \ make uninstall
--- a/OpenRA.Editor/ActorPropertiesDialog.Designer.cs
+++ b/OpenRA.Editor/ActorPropertiesDialog.Designer.cs
@@ -1,90 +0,0 @@
-namespace OpenRA.Editor
-{
-	partial class ActorPropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-			this.SuspendLayout();
-			// 
-			// button1
-			// 
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(226, 333);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 0;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			// 
-			// button2
-			// 
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button2.Enabled = false;
-			this.button2.Location = new System.Drawing.Point(145, 333);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 0;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			// 
-			// flowLayoutPanel1
-			// 
-			this.flowLayoutPanel1.AutoScroll = true;
-			this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 13);
-			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-			this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 314);
-			this.flowLayoutPanel1.TabIndex = 1;
-			// 
-			// ActorPropertiesDialog
-			// 
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(313, 368);
-			this.Controls.Add(this.flowLayoutPanel1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "ActorPropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Actor Properties";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-	}
-}
--- a/OpenRA.Editor/ActorPropertiesDialog.cs
+++ b/OpenRA.Editor/ActorPropertiesDialog.cs
@@ -1,48 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ActorPropertiesDialog : Form
-	{
-		public ActorPropertiesDialog()
-		{
-			InitializeComponent();
-		}
-
-		public void AddRow(string name, Control c)
-		{
-			flowLayoutPanel1.Controls.Add(new Label
-			{
-				Text = name,
-				Width = flowLayoutPanel1.Width * 3 / 10,
-				Height = 25,
-				TextAlign = ContentAlignment.MiddleLeft,
-			});
-
-			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
-			c.Height = 25;
-			flowLayoutPanel1.Controls.Add(c);
-		}
-
-		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
-		{
-			var r = new TextBox();
-			r.Text = FieldSaver.FormatValue(getter(), t);
-			r.LostFocus += (e, _) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
-			r.Enabled = false;
-			return r;
-		}
-	}
-}
--- a/OpenRA.Editor/ActorPropertiesDialog.resx
+++ b/OpenRA.Editor/ActorPropertiesDialog.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OpenRA.Editor/ActorTemplate.cs
+++ b/OpenRA.Editor/ActorTemplate.cs
@@ -1,35 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	class ActorTemplate
-	{
-		public Bitmap Bitmap;
-		public ActorInfo Info;
-		public EditorAppearanceInfo Appearance;
-	}
-
-	class BrushTemplate
-	{
-		public Bitmap Bitmap;
-		public ushort N;
-	}
-
-	class ResourceTemplate
-	{
-		public Bitmap Bitmap;
-		public ResourceTypeInfo Info;
-		public int Value;
-	}
-}
--- a/OpenRA.Editor/ActorTool.cs
+++ b/OpenRA.Editor/ActorTool.cs
@@ -1,51 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Linq;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ActorTool : ITool
-	{
-		ActorTemplate actorTemplate;
-		public ActorTool(ActorTemplate actor) { this.actorTemplate = actor; }
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawActor(g, surface.GetBrushLocation(), actorTemplate,
-				surface.GetPaletteForPlayer(surface.NewActorOwner));
-		}
-
-		public void Apply(Surface surface)
-		{
-			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
-				return;
-
-			var owner = surface.NewActorOwner;
-			var id = NextActorName(surface);
-			surface.Map.Actors.Value[id] = new ActorReference(actorTemplate.Info.Name.ToLowerInvariant())
-			{
-				new LocationInit(surface.GetBrushLocation()),
-				new OwnerInit(owner)
-			};
-		}
-
-		static string NextActorName(Surface surface)
-		{
-			var id = 0;
-			for (;;)
-			{
-				var possible = "Actor{0}".F(id++);
-				if (!surface.Map.Actors.Value.ContainsKey(possible)) return possible;
-			}
-		}
-	}
-}
--- a/OpenRA.Editor/BrushTool.cs
+++ b/OpenRA.Editor/BrushTool.cs
@@ -1,121 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class BrushTool : ITool
-	{
-		BrushTemplate brushTemplate;
-
-		public BrushTool(BrushTemplate brush) { this.brushTemplate = brush; }
-
-		public void Apply(Surface surface)
-		{
-			// change the bits in the map
-			var template = surface.TileSet.Templates[brushTemplate.N];
-			var tile = surface.TileSetRenderer.Data(brushTemplate.N);
-			var pos = surface.GetBrushLocation();
-
-			if (surface.GetModifiers() == Keys.Shift)
-			{
-				FloodFillWithBrush(surface, pos);
-				return;
-			}
-
-			for (var u = 0; u < template.Size.X; u++)
-				for (var v = 0; v < template.Size.Y; v++)
-				{
-					var cell = pos + new CVec(u, v);
-					if (surface.Map.Contains(cell))
-					{
-						var z = u + v * template.Size.X;
-						if (tile != null && tile[z].Length > 0)
-						{
-							var index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z;
-							surface.Map.MapTiles.Value[cell] = new TerrainTile(brushTemplate.N, index);
-						}
-
-						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
-						if (surface.Chunks.ContainsKey(ch))
-						{
-							surface.Chunks[ch].Dispose();
-							surface.Chunks.Remove(ch);
-						}
-					}
-				}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			g.DrawImage(brushTemplate.Bitmap,
-					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-					surface.TileSetRenderer.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
-					brushTemplate.Bitmap.Width * surface.Zoom,
-					brushTemplate.Bitmap.Height * surface.Zoom);
-		}
-
-		void FloodFillWithBrush(Surface s, CPos pos)
-		{
-			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos];
-			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
-
-			Action<int, int> maybeEnqueue = (x, y) =>
-			{
-				var c = new CPos(x, y);
-				if (s.Map.Contains(c) && !touched[x, y])
-				{
-					queue.Enqueue(c);
-					touched[x, y] = true;
-				}
-			};
-
-			queue.Enqueue(pos);
-			while (queue.Count > 0)
-			{
-				var p = queue.Dequeue();
-				if (s.Map.MapTiles.Value[p].Type != replace.Type)
-					continue;
-
-				var a = FindEdge(s, p, new CVec(-1, 0), replace);
-				var b = FindEdge(s, p, new CVec(1, 0), replace);
-
-				for (var x = a.X; x <= b.X; x++)
-				{
-					s.Map.MapTiles.Value[new CPos(x, p.Y)] = new TerrainTile(brushTemplate.N, (byte)0);
-					if (s.Map.MapTiles.Value[new CPos(x, p.Y - 1)].Type == replace.Type)
-						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[new CPos(x, p.Y + 1)].Type == replace.Type)
-						maybeEnqueue(x, p.Y + 1);
-				}
-			}
-
-			/* TODO: optimize */
-			foreach (var ch in s.Chunks.Values) ch.Dispose();
-			s.Chunks.Clear();
-		}
-
-		static CPos FindEdge(Surface s, CPos p, CVec d, TerrainTile replace)
-		{
-			for (;;)
-			{
-				var q = p + d;
-				if (!s.Map.Contains(q)) return p;
-				if (s.Map.MapTiles.Value[q].Type != replace.Type) return p;
-				p = q;
-			}
-		}
-	}
-}
--- a/OpenRA.Editor/ErrorListDialog.Designer.cs
+++ b/OpenRA.Editor/ErrorListDialog.Designer.cs
@@ -1,98 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ErrorListDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.listBox1 = new System.Windows.Forms.ListBox();
-			this.button1 = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			//
-			// label1
-			//
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.label1.Location = new System.Drawing.Point(10, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(610, 23);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Your map import completed, but with errors:";
-			//
-			// listBox1
-			//
-			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.listBox1.FormattingEnabled = true;
-			this.listBox1.Location = new System.Drawing.Point(13, 30);
-			this.listBox1.Name = "listBox1";
-			this.listBox1.Size = new System.Drawing.Size(607, 316);
-			this.listBox1.TabIndex = 1;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(545, 359);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Close";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// ErrorListDialog
-			//
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(632, 394);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.listBox1);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ErrorListDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Import Errors";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ListBox listBox1;
-		private System.Windows.Forms.Button button1;
-	}
-}
--- a/OpenRA.Editor/Form1.Designer.cs
+++ b/OpenRA.Editor/Form1.Designer.cs
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -1,731 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	public partial class Form1 : Form
-	{
-		public Form1(string[] args)
-		{
-			InitializeComponent();
-			AppDomain.CurrentDomain.AssemblyResolve += GlobalFileSystem.ResolveAssembly;
-
-			currentMod = args.FirstOrDefault() ?? "ra";
-
-			toolStripComboBox1.Items.AddRange(ModMetadata.AllMods.Keys.ToArray());
-
-			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
-			{
-				tilePalette.SuspendLayout();
-				actorPalette.SuspendLayout();
-				resourcePalette.SuspendLayout();
-				tilePalette.Controls.Clear();
-				actorPalette.Controls.Clear();
-				resourcePalette.Controls.Clear();
-				tilePalette.ResumeLayout();
-				actorPalette.ResumeLayout();
-				resourcePalette.ResumeLayout();
-				surface1.Bind(null, null, null, null, null);
-				miniMapBox.Image = null;
-				currentMod = toolStripComboBox1.SelectedItem as string;
-
-				Game.InitializeSettings(Arguments.Empty);
-				Game.ModData = new ModData(currentMod);
-				GlobalFileSystem.LoadFromManifest(Game.ModData.Manifest);
-				Program.Rules = Game.ModData.RulesetCache.LoadDefaultRules();
-
-				var mod = Game.ModData.Manifest.Mod;
-				Text = "{0} Mod Version: {1} - OpenRA Editor".F(mod.Title, mod.Version);
-
-				loadedMapName = null;
-			};
-
-			toolStripComboBox1.SelectedItem = currentMod;
-
-			surface1.AfterChange += OnMapChanged;
-			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
-			surface1.ActorDoubleClicked += ActorDoubleClicked;
-
-			if (args.Length >= 2)
-				LoadMap(args[1]);
-		}
-
-		void OnMapChanged()
-		{
-			MakeDirty();
-			var tileSet = Program.Rules.TileSets[surface1.Map.Tileset];
-			miniMapBox.Image = Minimap.RenderMapPreview(tileSet, surface1.Map, true);
-			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
-		}
-
-		void ActorDoubleClicked(KeyValuePair<string, ActorReference> kv)
-		{
-			using (var apd = new ActorPropertiesDialog())
-			{
-				var name = kv.Key;
-				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
-				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
-
-				var objSaved = kv.Value.Save();
-
-				// TODO: make this work properly
-				foreach (var init in Program.Rules.Actors[kv.Value.Type].GetInitKeys())
-				{
-					var initName = init.First;
-					apd.AddRow(initName,
-						apd.MakeEditorControl(init.Second,
-							() =>
-							{
-								var nodesDict = objSaved.ToDictionary();
-								return nodesDict.ContainsKey(initName) ? nodesDict[initName].Value : null;
-							},
-							_ => { }));
-				}
-
-				apd.ShowDialog();
-
-				// TODO: writeback
-			}
-		}
-
-		void MakeDirty() { dirty = true; }
-
-		string loadedMapName;
-		string currentMod = "ra";
-		TileSet tileset;
-		TileSetRenderer tilesetRenderer;
-		bool dirty = false;
-
-		void LoadMap(string mapname)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = mapname;
-
-			// load the map
-			var map = new Map(mapname);
-
-			// upgrade maps that have no player definitions. editor doesnt care,
-			// but this breaks the game pretty badly.
-			if (map.Players.Count == 0)
-				map.MakeDefaultPlayers();
-
-			PrepareMapResources(Game.ModData, map);
-
-			// Calculate total net worth of resources in cash
-			cashToolStripStatusLabel.Text = CalculateTotalResource().ToString();
-
-			dirty = false;
-		}
-
-		void NewMap(Map map)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = null;
-			PrepareMapResources(Game.ModData, map);
-
-			MakeDirty();
-		}
-
-		// this code is insanely stupid, and mostly my fault -- chrisf
-		void PrepareMapResources(ModData modData, Map map)
-		{
-			Program.Rules = map.Rules;
-
-			tileset = Program.Rules.TileSets[map.Tileset];
-			tilesetRenderer = new TileSetRenderer(tileset, modData.Manifest.TileSize);
-			var shadowIndex = new int[] { 3, 4 };
-			var palette = new ImmutablePalette(GlobalFileSystem.Open(tileset.Palette), shadowIndex);
-
-			// required for desert terrain in RA
-			var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
-			var shadowedPalette = new ImmutablePalette(GlobalFileSystem.Open(playerPalette), shadowIndex);
-
-			surface1.Bind(map, tileset, tilesetRenderer, palette, shadowedPalette);
-
-			// construct the palette of tiles
-			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
-			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
-
-			var templateOrder = tileset.EditorTemplateOrder ?? new string[] { };
-			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category).OrderBy(t => templateOrder.IndexOf(t.Key)))
-			{
-				var category = tc.Key ?? "(Uncategorized)";
-				var categoryHeader = new Label
-				{
-					BackColor = SystemColors.Highlight,
-					ForeColor = SystemColors.HighlightText,
-					Text = category,
-					AutoSize = false,
-					Height = 24,
-					TextAlign = ContentAlignment.MiddleLeft,
-					Width = tilePalette.ClientSize.Width,
-				};
-
-				// hook this manually, anchoring inside FlowLayoutPanel is flaky.
-				tilePalette.Resize += (_, e) => categoryHeader.Width = tilePalette.ClientSize.Width;
-
-				if (tilePalette.Controls.Count > 0)
-					tilePalette.SetFlowBreak(
-						tilePalette.Controls[tilePalette.Controls.Count - 1], true);
-				tilePalette.Controls.Add(categoryHeader);
-
-				foreach (var t in tc)
-				{
-					try
-					{
-						var bitmap = tilesetRenderer.RenderTemplate((ushort)t.Key, palette);
-						var ibox = new PictureBox
-						{
-							Image = bitmap,
-							Width = bitmap.Width / 2,
-							Height = bitmap.Height / 2,
-							SizeMode = PictureBoxSizeMode.StretchImage
-						};
-
-						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
-						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
-
-						var template = t.Value;
-						tilePalette.Controls.Add(ibox);
-						tt.SetToolTip(ibox, "{1}:{0} ({2}x{3})".F(template.Images[0], template.Id, template.Size.X, template.Size.Y));
-					}
-					catch { }
-				}
-			}
-
-			var actorTemplates = new List<ActorTemplate>();
-
-			foreach (var a in Program.Rules.Actors.Keys)
-			{
-				try
-				{
-					var info = Program.Rules.Actors[a];
-					if (!info.Traits.Contains<ILegacyEditorRenderInfo>()) continue;
-
-					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
-					if (etf != null && etf.ExcludeTilesets != null
-						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
-					if (etf != null && etf.RequireTilesets != null
-						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
-
-					var templatePalette = shadowedPalette;
-					var rsi = info.Traits.GetOrDefault<ILegacyEditorRenderInfo>();
-
-					// exception for desert buildings
-					if (rsi != null && rsi.EditorPalette != null && rsi.EditorPalette.Contains("terrain"))
-						templatePalette = palette;
-
-					var race = Program.Rules.Actors["world"].Traits.WithInterface<CountryInfo>().First().Race;
-					var sequenceProvider = Program.Rules.Sequences[tileset.Id];
-					var template = RenderUtils.RenderActor(info, sequenceProvider, tileset, templatePalette, race);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
-
-					actorPalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox, "{0}".F(info.Name));
-
-					actorTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindActorTemplates(actorTemplates);
-
-			var resourceTemplates = new List<ResourceTemplate>();
-
-			foreach (var a in Program.Rules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>())
-			{
-				try
-				{
-					var template = RenderUtils.RenderResourceType(a, tileset, shadowedPalette);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-					ibox.Click += (_, e) => surface1.SetTool(new ResourceTool(template));
-
-					resourcePalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox, "{0}:{1}cr".F(template.Info.Name, template.Info.ValuePerUnit));
-
-					resourceTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindResourceTemplates(resourceTemplates);
-
-			foreach (var p in palettes)
-			{
-				p.Visible = true;
-				p.ResumeLayout();
-			}
-
-			miniMapBox.Image = Minimap.RenderMapPreview(tileset, surface1.Map, true);
-
-			propertiesToolStripMenuItem.Enabled = true;
-			toolStripMenuItemProperties.Enabled = true;
-			resizeToolStripMenuItem.Enabled = true;
-			toolStripMenuItemResize.Enabled = true;
-			saveToolStripMenuItem.Enabled = true;
-			toolStripMenuItemSave.Enabled = true;
-			saveAsToolStripMenuItem.Enabled = true;
-			miniMapToPng.Enabled = true;
-
-			PopulateActorOwnerChooser();
-		}
-
-		void PopulateActorOwnerChooser()
-		{
-			actorOwnerChooser.Items.Clear();
-			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
-			actorOwnerChooser.SelectedIndex = 0;
-			surface1.NewActorOwner = ((PlayerReference)actorOwnerChooser.SelectedItem).Name;
-		}
-
-		void ResizeClicked(object sender, EventArgs e)
-		{
-			using (var rd = new ResizeDialog())
-			{
-				rd.MapWidth.Value = surface1.Map.MapSize.X;
-				rd.MapHeight.Value = surface1.Map.MapSize.Y;
-				rd.CordonLeft.Value = surface1.Map.Bounds.Left;
-				rd.CordonTop.Value = surface1.Map.Bounds.Top;
-				rd.CordonRight.Value = surface1.Map.Bounds.Right;
-				rd.CordonBottom.Value = surface1.Map.Bounds.Bottom;
-
-				if (DialogResult.OK != rd.ShowDialog())
-					return;
-
-				surface1.Map.ResizeCordon((int)rd.CordonLeft.Value,
-					(int)rd.CordonTop.Value,
-					(int)rd.CordonRight.Value,
-					(int)rd.CordonBottom.Value);
-
-				if ((int)rd.MapWidth.Value != surface1.Map.MapSize.X || (int)rd.MapHeight.Value != surface1.Map.MapSize.Y)
-				{
-					surface1.Map.Resize((int)rd.MapWidth.Value, (int)rd.MapHeight.Value);
-					surface1.Bind(surface1.Map, surface1.TileSet, surface1.TileSetRenderer, surface1.Palette, surface1.PlayerPalette);	// rebind it to invalidate all caches
-				}
-
-				surface1.Invalidate();
-			}
-		}
-
-		void SaveClicked(object sender, EventArgs e)
-		{
-			if (loadedMapName == null)
-				SaveAsClicked(sender, e);
-			else
-			{
-				surface1.Map.RequiresMod = currentMod;
-				surface1.Map.Save(loadedMapName);
-				dirty = false;
-			}
-		}
-
-		void SaveAsClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.NewText.ReadOnly = false;
-				nms.ButtonOkay.Text = "Save";
-				nms.NewText.Text = "unnamed";
-				nms.PathOutText.ReadOnly = false;
-
-				if (DialogResult.OK == nms.ShowDialog())
-				{
-					if (nms.NewText.Text == "")
-						nms.NewText.Text = "unnamed";
-
-					// TODO: Allow the user to choose map format (directory vs oramap)
-					loadedMapName = Path.Combine(nms.MapFolderPath, nms.NewText.Text + ".oramap");
-					SaveClicked(sender, e);
-				}
-			}
-		}
-
-		void OpenClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.NewText.ReadOnly = true;
-				nms.PathOutText.ReadOnly = true;
-				nms.ButtonOkay.Text = "Open";
-
-				if (DialogResult.OK == nms.ShowDialog())
-					LoadMap((string)nms.NewText.Tag);
-			}
-		}
-
-		void NewClicked(object sender, EventArgs e)
-		{
-			using (var nmd = new NewMapDialog())
-			{
-				nmd.TheaterBox.Items.Clear();
-				nmd.TheaterBox.Items.AddRange(Program.Rules.TileSets.Select(a => a.Value.Id).ToArray());
-				nmd.TheaterBox.SelectedIndex = 0;
-
-				if (DialogResult.OK == nmd.ShowDialog())
-				{
-					var tileset = Program.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
-					var map = Map.FromTileset(tileset);
-
-					map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value);
-					map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,
-						(int)nmd.CordonRight.Value, (int)nmd.CordonBottom.Value);
-
-					map.Players.Clear();
-					map.MakeDefaultPlayers();
-					map.FixOpenAreas(Program.Rules);
-
-					NewMap(map);
-				}
-			}
-		}
-
-		void PropertiesClicked(object sender, EventArgs e)
-		{
-			using (var pd = new PropertiesDialog())
-			{
-				pd.TitleBox.Text = surface1.Map.Title;
-				pd.DescBox.Text = surface1.Map.Description;
-				pd.AuthorBox.Text = surface1.Map.Author;
-				pd.MapVisibilityComboBox.SelectedIndex = pd.MapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility));
-
-				if (DialogResult.OK != pd.ShowDialog())
-					return;
-
-				surface1.Map.Title = pd.TitleBox.Text;
-				surface1.Map.Description = pd.DescBox.Text;
-				surface1.Map.Author = pd.AuthorBox.Text;
-				surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.MapVisibilityComboBox.SelectedItem.ToString());
-			}
-		}
-
-		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
-		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
-
-		void CloseClicked(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		void OnFormClosing(object sender, FormClosingEventArgs e)
-		{
-			if (!dirty) return;
-
-			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
-				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
-			{
-				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
-				case DialogResult.No: break;
-				case DialogResult.Cancel: e.Cancel = true; break;
-			}
-		}
-
-		void ExportMinimap(object sender, EventArgs e)
-		{
-			using (var sfd = new SaveFileDialog()
-			{
-				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
-				DefaultExt = "*.png",
-				Filter = "PNG Image (*.png)|*.png",
-				Title = "Export Minimap to PNG",
-				FileName = Path.ChangeExtension(loadedMapName, ".png"),
-				RestoreDirectory = true
-			})
-				if (DialogResult.OK == sfd.ShowDialog())
-					miniMapBox.Image.Save(sfd.FileName);
-		}
-
-		void ShowActorNamesClicked(object sender, EventArgs e)
-		{
-			showActorNamesToolStripMenuItem.Checked ^= true;
-			toolStripMenuItemShowActorNames.Checked ^= true;
-			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
-		}
-
-		void ShowGridClicked(object sender, EventArgs e)
-		{
-			showGridToolStripMenuItem.Checked ^= true;
-			toolStripMenuItemShowGrid.Checked ^= true;
-			surface1.ShowGrid = showGridToolStripMenuItem.Checked;
-			surface1.Chunks.Clear();
-		}
-
-		void FixOpenAreas(object sender, EventArgs e)
-		{
-			dirty = true;
-			surface1.Map.FixOpenAreas(Program.Rules);
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-		}
-
-		void SetupDefaultPlayers(object sender, EventArgs e)
-		{
-			dirty = true;
-			surface1.Map.Players.Clear();
-			surface1.Map.MakeDefaultPlayers();
-
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-
-			PopulateActorOwnerChooser();
-		}
-
-		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
-		{
-			// color block
-			var player = e.Index >= 0 ? (PlayerReference)((ComboBox)sender).Items[e.Index] : null;
-
-			e.DrawBackground();
-			e.DrawFocusRectangle();
-
-			if (player == null)
-				return;
-
-			var color = player.Color.RGB;
-			using (var brush = new SolidBrush(color))
-				e.Graphics.FillRectangle(brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4);
-			using (var foreBrush = new SolidBrush(e.ForeColor))
-				e.Graphics.DrawString(player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top);
-		}
-
-		void OnSelectedPlayerChanged(object sender, EventArgs e)
-		{
-			var player = actorOwnerChooser.SelectedItem as PlayerReference;
-			surface1.NewActorOwner = player.Name;
-		}
-
-		void CopySelectionToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			surface1.CopySelection();
-		}
-
-		void OpenRAWebsiteToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://www.openra.net");
-		}
-
-		void OpenRAResourcesToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://resource.openra.net");
-		}
-
-		void WikiDocumentationToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://wiki.openra.net");
-		}
-
-		void DiscussionForumsToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://www.sleipnirstuff.com/forum/viewforum.php?f=80");
-		}
-
-		void IssueTrackerToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://bugs.openra.net");
-		}
-
-		void DeveloperBountiesToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("https://www.bountysource.com/trackers/36085-openra");
-		}
-
-		void SourceCodeToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://github.com/OpenRA/OpenRA");
-		}
-
-		void AboutToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			MessageBox.Show(
-				"OpenRA and OpenRA Editor are Free/Libre Open Source Software released under the GNU General Public License version 3. See AUTHORS and COPYING for details.",
-				"About",
-				MessageBoxButtons.OK,
-				MessageBoxIcon.Asterisk);
-		}
-
-		void HelpToolStripButton_Click(object sender, EventArgs e)
-		{
-			System.Diagnostics.Process.Start("http://wiki.openra.net/Mapping");
-		}
-
-		void ToolStripMenuItemNewClick(object sender, EventArgs e)
-		{
-			NewClicked(sender, e);
-		}
-
-		void ToolStripMenuItemOpenClick(object sender, EventArgs e)
-		{
-			OpenClicked(sender, e);
-		}
-
-		void ToolStripMenuItemSaveClick(object sender, EventArgs e)
-		{
-			SaveClicked(sender, e);
-		}
-
-		void ToolStripMenuItemPropertiesClick(object sender, EventArgs e)
-		{
-			PropertiesClicked(sender, e);
-		}
-
-		void ToolStripMenuItemResizeClick(object sender, EventArgs e)
-		{
-			ResizeClicked(sender, e);
-		}
-
-		void ToolStripMenuItemShowActorNamesClick(object sender, EventArgs e)
-		{
-			ShowActorNamesClicked(sender, e);
-		}
-
-		void ToolStripMenuItemFixOpenAreasClick(object sender, EventArgs e)
-		{
-			FixOpenAreas(sender, e);
-		}
-
-		void ToolStripMenuItemSetupDefaultPlayersClick(object sender, EventArgs e)
-		{
-			SetupDefaultPlayers(sender, e);
-		}
-
-		void ToolStripMenuItemCopySelectionClick(object sender, EventArgs e)
-		{
-			CopySelectionToolStripMenuItemClick(sender, e);
-		}
-
-		void ToolStripMenuItemShowGridClick(object sender, EventArgs e)
-		{
-			ShowGridClicked(sender, e);
-		}
-
-		public int CalculateTotalResource()
-		{
-			var totalResource = 0;
-			for (var i = 0; i < surface1.Map.MapSize.X; i++)
-				for (var j = 0; j < surface1.Map.MapSize.Y; j++)
-				{
-					var cell = new CPos(i, j);
-					if (surface1.Map.MapResources.Value[cell].Type != 0)
-						totalResource += GetResourceValue(i, j);
-				}
-
-			return totalResource;
-		}
-
-		int GetAdjecentCellsWith(int resourceType, int x, int y)
-		{
-			var sum = 0;
-			for (var u = -1; u < 2; u++)
-				for (var v = -1; v < 2; v++)
-				{
-					var cell = new CPos(x + u, y + v);
-
-					if (!surface1.Map.Contains(cell))
-						continue;
-
-					if (surface1.Map.MapResources.Value[cell].Type == resourceType)
-						++sum;
-				}
-
-			return sum;
-		}
-
-		int GetResourceValue(int x, int y)
-		{
-			var imageLength = 0;
-			var type = surface1.Map.MapResources.Value[new CPos(x, y)].Type;
-			var template = surface1.ResourceTemplates.FirstOrDefault(a => a.Value.Info.ResourceType == type).Value;
-			if (type == 1)
-				imageLength = 12;
-			else if (type == 2)
-				imageLength = 3;
-			var density = (GetAdjecentCellsWith(type, x, y) * imageLength - 1) / 9;
-			var value = template.Info.ValuePerUnit;
-			return density * value;
-		}
-
-		void ZoomInToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			if (surface1.Map == null) return;
-
-			surface1.Zoom /= .75f;
-
-			surface1.Invalidate();
-		}
-
-		void ZoomOutToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			if (surface1.Map == null) return;
-
-			surface1.Zoom *= .75f;
-
-			surface1.Invalidate();
-		}
-
-		void PanToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			panToolStripButton.Checked ^= true;
-			surface1.IsPanning = panToolStripButton.Checked;
-		}
-
-		void ShowRulerToolStripMenuItemClick(object sender, EventArgs e)
-		{
-			showRulerToolStripMenuItem.Checked ^= true;
-			showRulerToolStripItem.Checked ^= true;
-			surface1.ShowRuler = showRulerToolStripMenuItem.Checked;
-			surface1.Chunks.Clear();
-		}
-
-		void ShowRulerToolStripItemClick(object sender, System.EventArgs e)
-		{
-			ShowRulerToolStripMenuItemClick(sender, e);
-		}
-
-		void EraserToolStripButtonClick(object sender, System.EventArgs e)
-		{
-			eraserToolStripButton.Checked ^= true;
-			surface1.IsErasing = eraserToolStripButton.Checked;
-		}
-	}
-}
--- a/OpenRA.Editor/Form1.resx
+++ b/OpenRA.Editor/Form1.resx
--- a/OpenRA.Editor/ITool.cs
+++ b/OpenRA.Editor/ITool.cs
@@ -1,20 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	interface ITool
-	{
-		void Apply(Surface surface);
-		void Preview(Surface surface, SGraphics g);
-	}
-}
--- a/OpenRA.Editor/MapSelect.Designer.cs
+++ b/OpenRA.Editor/MapSelect.Designer.cs
@@ -1,319 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class MapSelect
-	{
-		// TODO:
-		private System.ComponentModel.IContainer components = null;
-
-		// TODO:
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-
-			base.Dispose(disposing);
-		}
-
-		// TODO:
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
-			this.MapList = new System.Windows.Forms.ListView();
-			this.ColumnMapName = new System.Windows.Forms.ColumnHeader("(none)");
-			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
-			this.ButtonCancel = new System.Windows.Forms.Button();
-			this.ButtonOkay = new System.Windows.Forms.Button();
-			this.NewLabel = new System.Windows.Forms.Label();
-			this.NewText = new System.Windows.Forms.TextBox();
-			this.MiniMapBox = new System.Windows.Forms.PictureBox();
-			this.BottomPanel = new System.Windows.Forms.Panel();
-			this.PathOutText = new System.Windows.Forms.TextBox();
-			this.PathOutLabel = new System.Windows.Forms.Label();
-			this.PathLabel = new System.Windows.Forms.Label();
-			this.SplitContainer1 = new System.Windows.Forms.SplitContainer();
-			this.MapListLabel = new System.Windows.Forms.Label();
-			this.DescTxt = new System.Windows.Forms.TextBox();
-			this.DescLabel = new System.Windows.Forms.Label();
-			this.TheaterText = new System.Windows.Forms.TextBox();
-			this.TheaterLabel = new System.Windows.Forms.Label();
-			this.AuthorText = new System.Windows.Forms.TextBox();
-			this.AuthorLabel = new System.Windows.Forms.Label();
-			this.TitleText = new System.Windows.Forms.TextBox();
-			this.MapNameLabel = new System.Windows.Forms.Label();
-			this.MiniMapLabel = new System.Windows.Forms.Label();
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).BeginInit();
-			this.BottomPanel.SuspendLayout();
-			this.SplitContainer1.Panel1.SuspendLayout();
-			this.SplitContainer1.Panel2.SuspendLayout();
-			this.SplitContainer1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).BeginInit();
-			this.SuspendLayout();
-
-			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {	this.ColumnMapName });
-			this.MapList.FullRowSelect = true;
-			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.MapList.LargeImageList = this.MapIconsList;
-			this.MapList.Location = new System.Drawing.Point(15, 25);
-			this.MapList.MultiSelect = false;
-			this.MapList.Name = "MapList";
-			this.MapList.Size = new System.Drawing.Size(273, 294);
-			this.MapList.SmallImageList = this.MapIconsList;
-			this.MapList.StateImageList = this.MapIconsList;
-			this.MapList.TabIndex = 0;
-			this.MapList.UseCompatibleStateImageBehavior = false;
-			this.MapList.View = System.Windows.Forms.View.Details;
-			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
-
-			this.ColumnMapName.Text = "Map name";
-			this.ColumnMapName.Width = 240;
-
-			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
-			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
-			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-
-			this.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ButtonCancel.Location = new System.Drawing.Point(407, 35);
-			this.ButtonCancel.Name = "btnCancel";
-			this.ButtonCancel.Size = new System.Drawing.Size(75, 23);
-			this.ButtonCancel.TabIndex = 3;
-			this.ButtonCancel.Text = "Cancel";
-			this.ButtonCancel.UseVisualStyleBackColor = true;
-
-			this.ButtonOkay.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.ButtonOkay.Location = new System.Drawing.Point(326, 35);
-			this.ButtonOkay.Name = "btnOk";
-			this.ButtonOkay.Size = new System.Drawing.Size(75, 23);
-			this.ButtonOkay.TabIndex = 2;
-			this.ButtonOkay.Text = "Open";
-			this.ButtonOkay.UseVisualStyleBackColor = true;
-
-			this.NewLabel.AutoSize = true;
-			this.NewLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.NewLabel.Location = new System.Drawing.Point(12, 40);
-			this.NewLabel.Name = "lblNew";
-			this.NewLabel.Size = new System.Drawing.Size(69, 13);
-			this.NewLabel.TabIndex = 3;
-			this.NewLabel.Text = "Map name:";
-
-			this.NewText.BackColor = System.Drawing.SystemColors.Window;
-			this.NewText.Location = new System.Drawing.Point(88, 37);
-			this.NewText.Name = "txtNew";
-			this.NewText.ReadOnly = true;
-			this.NewText.Size = new System.Drawing.Size(232, 20);
-			this.NewText.TabIndex = 1;
-
-			this.MiniMapBox.BackColor = System.Drawing.Color.Black;
-			this.MiniMapBox.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.MiniMapBox.Location = new System.Drawing.Point(32, 25);
-			this.MiniMapBox.Name = "pbMinimap";
-			this.MiniMapBox.Size = new System.Drawing.Size(124, 124);
-			this.MiniMapBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-			this.MiniMapBox.TabIndex = 5;
-			this.MiniMapBox.TabStop = false;
-
-			this.BottomPanel.Controls.Add(this.pictureBox1);
-			this.BottomPanel.Controls.Add(this.PathOutText);
-			this.BottomPanel.Controls.Add(this.PathOutLabel);
-			this.BottomPanel.Controls.Add(this.PathLabel);
-			this.BottomPanel.Controls.Add(this.ButtonCancel);
-			this.BottomPanel.Controls.Add(this.ButtonOkay);
-			this.BottomPanel.Controls.Add(this.NewText);
-			this.BottomPanel.Controls.Add(this.NewLabel);
-			this.BottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.BottomPanel.Location = new System.Drawing.Point(0, 332);
-			this.BottomPanel.MaximumSize = new System.Drawing.Size(0, 70);
-			this.BottomPanel.Name = "pnlBottom";
-			this.BottomPanel.Size = new System.Drawing.Size(494, 70);
-			this.BottomPanel.TabIndex = 6;
-
-			this.PathOutText.BackColor = System.Drawing.SystemColors.Window;
-			this.PathOutText.Location = new System.Drawing.Point(55, 10);
-			this.PathOutText.Name = "txtPathOut";
-			this.PathOutText.ReadOnly = true;
-			this.PathOutText.Size = new System.Drawing.Size(265, 20);
-			this.PathOutText.TabIndex = 0;
-			this.PathOutText.TextChanged += new System.EventHandler(this.PathOutTextChanged);
-
-			this.PathOutLabel.AutoSize = true;
-			this.PathOutLabel.Location = new System.Drawing.Point(55, 13);
-			this.PathOutLabel.Name = "lblPathOut";
-			this.PathOutLabel.Size = new System.Drawing.Size(0, 13);
-			this.PathOutLabel.TabIndex = 6;
-
-			this.PathLabel.AutoSize = true;
-			this.PathLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.PathLabel.Location = new System.Drawing.Point(12, 13);
-			this.PathLabel.Name = "lblPath";
-			this.PathLabel.Size = new System.Drawing.Size(37, 13);
-			this.PathLabel.TabIndex = 5;
-			this.PathLabel.Text = "Path:";
-
-			this.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.SplitContainer1.Location = new System.Drawing.Point(0, 0);
-			this.SplitContainer1.Name = "splitContainer1";
-
-			this.SplitContainer1.Panel1.Controls.Add(this.MapListLabel);
-			this.SplitContainer1.Panel1.Controls.Add(this.MapList);
-
-			this.SplitContainer1.Panel2.Controls.Add(this.DescTxt);
-			this.SplitContainer1.Panel2.Controls.Add(this.DescLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterText);
-			this.SplitContainer1.Panel2.Controls.Add(this.TheaterLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorText);
-			this.SplitContainer1.Panel2.Controls.Add(this.AuthorLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.TitleText);
-			this.SplitContainer1.Panel2.Controls.Add(this.MapNameLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapLabel);
-			this.SplitContainer1.Panel2.Controls.Add(this.MiniMapBox);
-			this.SplitContainer1.Size = new System.Drawing.Size(494, 332);
-			this.SplitContainer1.SplitterDistance = 300;
-			this.SplitContainer1.TabIndex = 7;
-
-			this.MapListLabel.AutoSize = true;
-			this.MapListLabel.Location = new System.Drawing.Point(12, 9);
-			this.MapListLabel.Name = "lblMapList";
-			this.MapListLabel.Size = new System.Drawing.Size(81, 13);
-			this.MapListLabel.TabIndex = 1;
-			this.MapListLabel.Text = "Available maps:";
-
-			this.DescTxt.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.DescTxt.Location = new System.Drawing.Point(16, 289);
-			this.DescTxt.Name = "txtDesc";
-			this.DescTxt.ReadOnly = true;
-			this.DescTxt.Size = new System.Drawing.Size(162, 20);
-			this.DescTxt.TabIndex = 14;
-
-			this.DescLabel.AutoSize = true;
-			this.DescLabel.Location = new System.Drawing.Point(13, 273);
-			this.DescLabel.Name = "lblDesc";
-			this.DescLabel.Size = new System.Drawing.Size(63, 13);
-			this.DescLabel.TabIndex = 13;
-			this.DescLabel.Text = "Description:";
-
-			this.TheaterText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TheaterText.Location = new System.Drawing.Point(16, 252);
-			this.TheaterText.Name = "txtTheater";
-			this.TheaterText.ReadOnly = true;
-			this.TheaterText.Size = new System.Drawing.Size(162, 20);
-			this.TheaterText.TabIndex = 12;
-
-			this.TheaterLabel.AutoSize = true;
-			this.TheaterLabel.Location = new System.Drawing.Point(13, 236);
-			this.TheaterLabel.Name = "lblTheater";
-			this.TheaterLabel.Size = new System.Drawing.Size(47, 13);
-			this.TheaterLabel.TabIndex = 11;
-			this.TheaterLabel.Text = "Tileset:";
-
-			this.AuthorText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.AuthorText.Location = new System.Drawing.Point(16, 214);
-			this.AuthorText.Name = "txtAuthor";
-			this.AuthorText.ReadOnly = true;
-			this.AuthorText.Size = new System.Drawing.Size(162, 20);
-			this.AuthorText.TabIndex = 10;
-
-			this.AuthorLabel.AutoSize = true;
-			this.AuthorLabel.Location = new System.Drawing.Point(13, 198);
-			this.AuthorLabel.Name = "lblAuthor";
-			this.AuthorLabel.Size = new System.Drawing.Size(41, 13);
-			this.AuthorLabel.TabIndex = 9;
-			this.AuthorLabel.Text = "Author:";
-
-			this.TitleText.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.TitleText.Location = new System.Drawing.Point(16, 177);
-			this.TitleText.Name = "txtTitle";
-			this.TitleText.ReadOnly = true;
-			this.TitleText.Size = new System.Drawing.Size(162, 20);
-			this.TitleText.TabIndex = 8;
-
-			this.MapNameLabel.AutoSize = true;
-			this.MapNameLabel.Location = new System.Drawing.Point(13, 161);
-			this.MapNameLabel.Name = "lblMapName";
-			this.MapNameLabel.Size = new System.Drawing.Size(30, 13);
-			this.MapNameLabel.TabIndex = 7;
-			this.MapNameLabel.Text = "Title:";
-
-			this.MiniMapLabel.AutoSize = true;
-			this.MiniMapLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)204);
-			this.MiniMapLabel.Location = new System.Drawing.Point(29, 9);
-			this.MiniMapLabel.Name = "lblMinimap";
-			this.MiniMapLabel.Size = new System.Drawing.Size(71, 13);
-			this.MiniMapLabel.TabIndex = 6;
-			this.MiniMapLabel.Text = "Map preview:";
-
-			this.pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image");
-			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
-			this.pictureBox1.TabIndex = 7;
-			this.pictureBox1.TabStop = false;
-			this.pictureBox1.Visible = false;
-
-			this.AcceptButton = this.ButtonOkay;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.ButtonCancel;
-			this.ClientSize = new System.Drawing.Size(494, 402);
-			this.Controls.Add(this.SplitContainer1);
-			this.Controls.Add(this.BottomPanel);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "MapSelect";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Select map";
-			this.Load += new System.EventHandler(this.MapSelect_Load);
-			((System.ComponentModel.ISupportInitialize)this.MiniMapBox).EndInit();
-			this.BottomPanel.ResumeLayout(false);
-			this.BottomPanel.PerformLayout();
-			this.SplitContainer1.Panel1.ResumeLayout(false);
-			this.SplitContainer1.Panel1.PerformLayout();
-			this.SplitContainer1.Panel2.ResumeLayout(false);
-			this.SplitContainer1.Panel2.PerformLayout();
-			this.SplitContainer1.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)this.pictureBox1).EndInit();
-			this.ResumeLayout(false);
-		}
-
-		public System.Windows.Forms.ListView MapList;
-		public System.Windows.Forms.Button ButtonCancel;
-		public System.Windows.Forms.Button ButtonOkay;
-		public System.Windows.Forms.Label NewLabel;
-		public System.Windows.Forms.TextBox NewText;
-		public System.Windows.Forms.ColumnHeader ColumnMapName;
-		public System.Windows.Forms.ImageList MapIconsList;
-		public System.Windows.Forms.PictureBox MiniMapBox;
-		public System.Windows.Forms.Panel BottomPanel;
-		public System.Windows.Forms.SplitContainer SplitContainer1;
-		public System.Windows.Forms.Label MiniMapLabel;
-		public System.Windows.Forms.TextBox TheaterText;
-		public System.Windows.Forms.Label TheaterLabel;
-		public System.Windows.Forms.TextBox AuthorText;
-		public System.Windows.Forms.Label AuthorLabel;
-		public System.Windows.Forms.TextBox TitleText;
-		public System.Windows.Forms.Label MapNameLabel;
-		public System.Windows.Forms.TextBox DescTxt;
-		public System.Windows.Forms.Label DescLabel;
-		public System.Windows.Forms.Label MapListLabel;
-		public System.Windows.Forms.Label PathOutLabel;
-		public System.Windows.Forms.Label PathLabel;
-		public System.Windows.Forms.TextBox PathOutText;
-		private System.Windows.Forms.PictureBox pictureBox1;
-	}
-}
--- a/OpenRA.Editor/MapSelect.cs
+++ b/OpenRA.Editor/MapSelect.cs
@@ -1,92 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public partial class MapSelect : Form
-	{
-		public string MapFolderPath;
-
-		public bool DirectoryIsEmpty(string path)
-		{
-			return !Directory.GetFileSystemEntries(path).Any();
-		}
-
-		public MapSelect(string currentMod)
-		{
-			MapFolderPath = Platform.ResolvePath("^", "maps", currentMod);
-
-			if (!Directory.Exists(MapFolderPath))
-				Directory.CreateDirectory(MapFolderPath);
-
-			InitializeComponent();
-			MapIconsList.Images.Add(pictureBox1.Image);
-		}
-
-		void MapSelect_Load(object sender, EventArgs e)
-		{
-			MapList.Items.Clear();
-			PathOutText.Text = MapFolderPath;
-
-			if (DirectoryIsEmpty(MapFolderPath))
-				return;
-
-			foreach (var map in MapCache.FindMapsIn(MapFolderPath))
-			{
-				var map1 = new ListViewItem();
-				map1.Tag = map;
-				map1.Text = Path.GetFileNameWithoutExtension(map);
-				map1.ImageIndex = 0;
-				MapList.Items.Add(map1);
-			}
-
-			// hack
-			if (NewText.Text != "unnamed")
-				MapList.Items[0].Selected = true;
-		}
-
-		void MapList_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (MapList.SelectedItems.Count == 1)
-			{
-				NewText.Text = MapList.SelectedItems[0].Text;
-				NewText.Tag = MapList.SelectedItems[0].Tag;
-
-				var map = new Map((string)NewText.Tag);
-				TitleText.Text = map.Title;
-				AuthorText.Text = map.Author;
-				TheaterText.Text = map.Tileset;
-				DescTxt.Text = map.Description;
-				MiniMapBox.Image = null;
-
-				try
-				{
-					var tileset = Program.Rules.TileSets[map.Tileset];
-					MiniMapBox.Image = Minimap.RenderMapPreview(tileset, map, true);
-				}
-				catch (Exception ed)
-				{
-					Console.WriteLine("No map preview image found: {0}", ed);
-				}
-			}
-		}
-
-		void PathOutTextChanged(object sender, EventArgs e)
-		{
-			MapFolderPath = PathOutText.Text;
-		}
-	}
-}
--- a/OpenRA.Editor/MapSelect.resx
+++ b/OpenRA.Editor/MapSelect.resx
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
-        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
-        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
-        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
-        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
-        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
-        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
-        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
-        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
-        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
-        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
-        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
-        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
-        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
-        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
-        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
-        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
-        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
-        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
-        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
-        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
-        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
-        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
-        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
-        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
-        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
-        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
-        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
-        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
-        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
-        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
-        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
-        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
-        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
-        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
-        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
-        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
-        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
-        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
-        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
-        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
-        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
-        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
-        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
-        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
-        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
-        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
-        ga8AAAAASUVORK5CYII=
-</value>
-  </data>
-</root>
--- a/OpenRA.Editor/NewMapDialog.Designer.cs
+++ b/OpenRA.Editor/NewMapDialog.Designer.cs
@@ -1,295 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class NewMapDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label1 = new System.Windows.Forms.Label();
-			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.CordonTop = new System.Windows.Forms.NumericUpDown();
-			this.CordonRight = new System.Windows.Forms.NumericUpDown();
-			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.MapHeight = new System.Windows.Forms.NumericUpDown();
-			this.MapWidth = new System.Windows.Forms.NumericUpDown();
-			this.label4 = new System.Windows.Forms.Label();
-			this.TheaterBox = new System.Windows.Forms.ComboBox();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(229, 160);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 7;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(310, 160);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 8;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(31, 77);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 9;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(31, 51);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 11;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(31, 25);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 10;
-			this.label1.Text = "Size";
-			//
-			// cordonBottom
-			//
-			this.CordonBottom.Location = new System.Drawing.Point(280, 75);
-			this.CordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonBottom.Name = "cordonBottom";
-			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.CordonBottom.TabIndex = 5;
-			this.CordonBottom.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.CordonBottom.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonTop
-			//
-			this.CordonTop.Location = new System.Drawing.Point(280, 49);
-			this.CordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonTop.Name = "cordonTop";
-			this.CordonTop.Size = new System.Drawing.Size(105, 20);
-			this.CordonTop.TabIndex = 3;
-			this.CordonTop.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.CordonTop.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonRight
-			//
-			this.CordonRight.Location = new System.Drawing.Point(169, 75);
-			this.CordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonRight.Name = "cordonRight";
-			this.CordonRight.Size = new System.Drawing.Size(105, 20);
-			this.CordonRight.TabIndex = 4;
-			this.CordonRight.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.CordonRight.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonLeft
-			//
-			this.CordonLeft.Location = new System.Drawing.Point(169, 49);
-			this.CordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonLeft.Name = "cordonLeft";
-			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.CordonLeft.TabIndex = 2;
-			this.CordonLeft.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.CordonLeft.Enter += new System.EventHandler(this.SelectText);
-			//
-			// height
-			//
-			this.MapHeight.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapHeight.Location = new System.Drawing.Point(280, 23);
-			this.MapHeight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapHeight.Name = "height";
-			this.MapHeight.Size = new System.Drawing.Size(105, 20);
-			this.MapHeight.TabIndex = 1;
-			this.MapHeight.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.MapHeight.Enter += new System.EventHandler(this.SelectText);
-			//
-			// width
-			//
-			this.MapWidth.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapWidth.Location = new System.Drawing.Point(169, 23);
-			this.MapWidth.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapWidth.Name = "width";
-			this.MapWidth.Size = new System.Drawing.Size(105, 20);
-			this.MapWidth.TabIndex = 0;
-			this.MapWidth.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.MapWidth.Enter += new System.EventHandler(this.SelectText);
-			//
-			// label4
-			//
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(31, 124);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(44, 13);
-			this.label4.TabIndex = 14;
-			this.label4.Text = "Tileset";
-			//
-			// theater
-			//
-			this.TheaterBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.TheaterBox.FormattingEnabled = true;
-			this.TheaterBox.Location = new System.Drawing.Point(169, 121);
-			this.TheaterBox.Name = "theater";
-			this.TheaterBox.Size = new System.Drawing.Size(216, 21);
-			this.TheaterBox.TabIndex = 6;
-			//
-			// NewMapDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(418, 210);
-			this.Controls.Add(this.TheaterBox);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.CordonBottom);
-			this.Controls.Add(this.CordonTop);
-			this.Controls.Add(this.CordonRight);
-			this.Controls.Add(this.CordonLeft);
-			this.Controls.Add(this.MapHeight);
-			this.Controls.Add(this.MapWidth);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "NewMapDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "New Map";
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.NumericUpDown CordonBottom;
-		public System.Windows.Forms.NumericUpDown CordonTop;
-		public System.Windows.Forms.NumericUpDown CordonRight;
-		public System.Windows.Forms.NumericUpDown CordonLeft;
-		public System.Windows.Forms.NumericUpDown MapHeight;
-		public System.Windows.Forms.NumericUpDown MapWidth;
-		private System.Windows.Forms.Label label4;
-		public System.Windows.Forms.ComboBox TheaterBox;
-	}
-}
--- a/OpenRA.Editor/NewMapDialog.cs
+++ b/OpenRA.Editor/NewMapDialog.cs
@@ -1,28 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class NewMapDialog : Form
-	{
-		public NewMapDialog()
-		{
-			InitializeComponent();
-		}
-
-		void SelectText(object sender, System.EventArgs e)
-		{
-			var ud = sender as NumericUpDown;
-			ud.Select(0, ud.ToString().Length);
-		}
-	}
-}
--- a/OpenRA.Editor/NewMapDialog.resx
+++ b/OpenRA.Editor/NewMapDialog.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OpenRA.Editor/OpenRA.Editor.Icon.ico
+++ b/OpenRA.Editor/OpenRA.Editor.Icon.ico
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Editor</RootNamespace>
-    <AssemblyName>OpenRA.Editor</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Eluant">
-      <HintPath>..\thirdparty\Eluant.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActorPropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ActorPropertiesDialog.Designer.cs">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ActorTemplate.cs" />
-    <Compile Include="ActorTool.cs" />
-    <Compile Include="BrushTool.cs" />
-    <Compile Include="ErrorListDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ErrorListDialog.Designer.cs">
-      <DependentUpon>ErrorListDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ITool.cs" />
-    <Compile Include="MapSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapSelect.Designer.cs">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewMapDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewMapDialog.Designer.cs">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="PropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PropertiesDialog.Designer.cs">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="ActorPropertiesDialog.resx">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapSelect.resx">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewMapDialog.resx">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PropertiesDialog.resx">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ResizeDialog.resx">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="RenderUtils.cs" />
-    <Compile Include="ResizeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ResizeDialog.Designer.cs">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ResourceTool.cs" />
-    <Compile Include="Surface.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TileSetRenderer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-      <Project>{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}</Project>
-      <Name>OpenRA.Mods.Common</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="OpenRA.Editor.Icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/OpenRA.Editor/Program.cs
+++ b/OpenRA.Editor/Program.cs
@@ -1,33 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Globalization;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	static class Program
-	{
-		public static Ruleset Rules;
-
-		[STAThread]
-		static void Main(string[] args)
-		{
-			Log.AddChannel("perf", null);
-
-			Application.CurrentCulture = CultureInfo.InvariantCulture;
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			Application.Run(new Form1(args));
-		}
-	}
-}
--- a/OpenRA.Editor/Properties/Resources.Designer.cs
+++ b/OpenRA.Editor/Properties/Resources.Designer.cs
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
--- a/OpenRA.Editor/Properties/Resources.resx
+++ b/OpenRA.Editor/Properties/Resources.resx
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OpenRA.Editor/Properties/Settings.Designer.cs
+++ b/OpenRA.Editor/Properties/Settings.Designer.cs
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
--- a/OpenRA.Editor/Properties/Settings.settings
+++ b/OpenRA.Editor/Properties/Settings.settings
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
--- a/OpenRA.Editor/PropertiesDialog.Designer.cs
+++ b/OpenRA.Editor/PropertiesDialog.Designer.cs
@@ -1,182 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class PropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.TitleBox = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.DescBox = new System.Windows.Forms.TextBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.AuthorBox = new System.Windows.Forms.TextBox();
-			this.MapVisibilityComboBox = new System.Windows.Forms.ComboBox();
-			this.label4 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(196, 193);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 14;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(277, 193);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 15;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 50);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 16;
-			this.label1.Text = "Title";
-			//
-			// title
-			//
-			this.TitleBox.Location = new System.Drawing.Point(66, 47);
-			this.TitleBox.Name = "title";
-			this.TitleBox.Size = new System.Drawing.Size(286, 20);
-			this.TitleBox.TabIndex = 17;
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(12, 76);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(32, 13);
-			this.label2.TabIndex = 16;
-			this.label2.Text = "Desc";
-			//
-			// desc
-			//
-			this.DescBox.Location = new System.Drawing.Point(66, 73);
-			this.DescBox.Name = "desc";
-			this.DescBox.Size = new System.Drawing.Size(286, 20);
-			this.DescBox.TabIndex = 17;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(12, 102);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(38, 13);
-			this.label3.TabIndex = 16;
-			this.label3.Text = "Author";
-			//
-			// author
-			//
-			this.AuthorBox.Location = new System.Drawing.Point(66, 99);
-			this.AuthorBox.Name = "author";
-			this.AuthorBox.Size = new System.Drawing.Size(286, 20);
-			this.AuthorBox.TabIndex = 17;
-			//
-			//
-			// mapVisibilityComboBox
-			// 
-			this.MapVisibilityComboBox.FormattingEnabled = true;
-			this.MapVisibilityComboBox.Items.AddRange(new object[] {
-			"Lobby",
-			"Shellmap",
-			"MissionSelector"});
-			this.MapVisibilityComboBox.Location = new System.Drawing.Point(150, 137);
-			this.MapVisibilityComboBox.Name = "mapVisibilityComboBox";
-			this.MapVisibilityComboBox.Size = new System.Drawing.Size(121, 21);
-			this.MapVisibilityComboBox.TabIndex = 19;
-			// 
-			// label4
-			// 
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(90, 140);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(58, 13);
-			this.label4.TabIndex = 20;
-			this.label4.Text = "Map class:";
-			// PropertiesDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.MapVisibilityComboBox);
-			this.Controls.Add(this.AuthorBox);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.DescBox);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.TitleBox);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Properties";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.TextBox TitleBox;
-		private System.Windows.Forms.Label label2;
-		public System.Windows.Forms.TextBox DescBox;
-		private System.Windows.Forms.Label label3;
-		public System.Windows.Forms.TextBox AuthorBox;
-		public System.Windows.Forms.ComboBox MapVisibilityComboBox;
-		private System.Windows.Forms.Label label4;
-	}
-}
--- a/OpenRA.Editor/PropertiesDialog.resx
+++ b/OpenRA.Editor/PropertiesDialog.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OpenRA.Editor/RenderUtils.cs
+++ b/OpenRA.Editor/RenderUtils.cs
@@ -1,112 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.FileFormats;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.SpriteLoaders;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	static class RenderUtils
-	{
-		static Bitmap RenderShp(ShpTDSprite shp, IPalette p)
-		{
-			var frame = shp.Frames.First();
-
-			var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				var q = (byte*)data.Scan0.ToPointer();
-				var stride2 = data.Stride;
-
-				for (var i = 0; i < frame.Size.Width; i++)
-					for (var j = 0; j < frame.Size.Height; j++)
-						q[j * stride2 + i] = frame.Data[i + frame.Size.Width * j];
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		static readonly string[] LegacyExtensions = new[] { ".shp", ".tem", "" };
-
-		static string ResolveFilename(string name, TileSet tileSet)
-		{
-			var ssl = Game.ModData.SpriteSequenceLoader as TilesetSpecificSpriteSequenceLoader;
-			var extensions = ssl != null ? new[] { ssl.TilesetExtensions[tileSet.Id], ssl.DefaultSpriteExtension }.Append(LegacyExtensions) :
-				LegacyExtensions.AsEnumerable();
-
-			foreach (var e in extensions)
-				if (GlobalFileSystem.Exists(name + e))
-					return name + e;
-
-			return name;
-		}
-
-		public static ActorTemplate RenderActor(ActorInfo info, SequenceProvider sequenceProvider, TileSet tileset, IPalette p, string race)
-		{
-			var image = info.Traits.Get<ILegacyEditorRenderInfo>().EditorImage(info, sequenceProvider, race);
-			image = ResolveFilename(image, tileset);
-			using (var s = GlobalFileSystem.Open(image))
-			{
-				var shp = new ShpTDSprite(s);
-				var bitmap = RenderShp(shp, p);
-
-				return new ActorTemplate
-				{
-					Bitmap = bitmap,
-					Info = info,
-					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
-				};
-			}
-		}
-
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, TileSet tileset, IPalette p)
-		{
-			var image = ResolveFilename(info.EditorSprite, tileset);
-			using (var s = GlobalFileSystem.Open(image))
-			{
-				// TODO: Do this properly
-				var shp = new ShpTDSprite(s);
-				var frame = shp.Frames.Last();
-
-				var bitmap = new Bitmap(frame.Size.Width, frame.Size.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = p.AsSystemPalette();
-				var data = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-				unsafe
-				{
-					var q = (byte*)data.Scan0.ToPointer();
-					var stride = data.Stride;
-
-					for (var i = 0; i < frame.Size.Width; i++)
-						for (var j = 0; j < frame.Size.Height; j++)
-							q[j * stride + i] = frame.Data[i + frame.Size.Width * j];
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.Frames.Count - 1 };
-			}
-		}
-	}
-}
--- a/OpenRA.Editor/ResizeDialog.Designer.cs
+++ b/OpenRA.Editor/ResizeDialog.Designer.cs
@@ -1,235 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ResizeDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-				components.Dispose();
-
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.MapWidth = new System.Windows.Forms.NumericUpDown();
-			this.label1 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.CordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.CordonTop = new System.Windows.Forms.NumericUpDown();
-			this.CordonRight = new System.Windows.Forms.NumericUpDown();
-			this.CordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.label3 = new System.Windows.Forms.Label();
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.MapHeight = new System.Windows.Forms.NumericUpDown();
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).BeginInit();
-			this.SuspendLayout();
-			//
-			// width
-			//
-			this.MapWidth.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapWidth.Location = new System.Drawing.Point(161, 18);
-			this.MapWidth.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapWidth.Name = "width";
-			this.MapWidth.Size = new System.Drawing.Size(105, 20);
-			this.MapWidth.TabIndex = 0;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(23, 20);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Size";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(23, 46);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 1;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// cordonLeft
-			//
-			this.CordonLeft.Location = new System.Drawing.Point(161, 44);
-			this.CordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonLeft.Name = "cordonLeft";
-			this.CordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.CordonLeft.TabIndex = 0;
-			//
-			// cordonTop
-			//
-			this.CordonTop.Location = new System.Drawing.Point(272, 44);
-			this.CordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonTop.Name = "cordonTop";
-			this.CordonTop.Size = new System.Drawing.Size(105, 20);
-			this.CordonTop.TabIndex = 0;
-			//
-			// cordonRight
-			//
-			this.CordonRight.Location = new System.Drawing.Point(161, 70);
-			this.CordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonRight.Name = "cordonRight";
-			this.CordonRight.Size = new System.Drawing.Size(105, 20);
-			this.CordonRight.TabIndex = 0;
-			//
-			// cordonBottom
-			//
-			this.CordonBottom.Location = new System.Drawing.Point(272, 70);
-			this.CordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.CordonBottom.Name = "cordonBottom";
-			this.CordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.CordonBottom.TabIndex = 0;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(23, 72);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 1;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(302, 111);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(221, 111);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 2;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// height
-			//
-			this.MapHeight.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.MapHeight.Location = new System.Drawing.Point(272, 18);
-			this.MapHeight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.MapHeight.Name = "height";
-			this.MapHeight.Size = new System.Drawing.Size(105, 20);
-			this.MapHeight.TabIndex = 0;
-			//
-			// ResizeDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(409, 146);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.CordonBottom);
-			this.Controls.Add(this.CordonTop);
-			this.Controls.Add(this.CordonRight);
-			this.Controls.Add(this.CordonLeft);
-			this.Controls.Add(this.MapHeight);
-			this.Controls.Add(this.MapWidth);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ResizeDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Resize Map";
-			((System.ComponentModel.ISupportInitialize)(this.MapWidth)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.CordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.MapHeight)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		public System.Windows.Forms.NumericUpDown MapWidth;
-		public System.Windows.Forms.NumericUpDown CordonLeft;
-		public System.Windows.Forms.NumericUpDown CordonTop;
-		public System.Windows.Forms.NumericUpDown CordonRight;
-		public System.Windows.Forms.NumericUpDown CordonBottom;
-		public System.Windows.Forms.NumericUpDown MapHeight;
-	}
-}
--- a/OpenRA.Editor/ResizeDialog.cs
+++ b/OpenRA.Editor/ResizeDialog.cs
@@ -1,22 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ResizeDialog : Form
-	{
-		public ResizeDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}
--- a/OpenRA.Editor/ResizeDialog.resx
+++ b/OpenRA.Editor/ResizeDialog.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
--- a/OpenRA.Editor/ResourceTool.cs
+++ b/OpenRA.Editor/ResourceTool.cs
@@ -1,45 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ResourceTool : ITool
-	{
-		ResourceTemplate resourceTemplate;
-
-		public ResourceTool(ResourceTemplate resource) { resourceTemplate = resource; }
-
-		public void Apply(Surface surface)
-		{
-			var type = (byte)resourceTemplate.Info.ResourceType;
-			var index = (byte)random.Next(resourceTemplate.Info.MaxDensity);
-			surface.Map.MapResources.Value[surface.GetBrushLocation()] = new ResourceTile(type, index);
-
-			var ch = new int2(surface.GetBrushLocation().X / Surface.ChunkSize,
-				surface.GetBrushLocation().Y / Surface.ChunkSize);
-
-			if (surface.Chunks.ContainsKey(ch))
-			{
-				surface.Chunks[ch].Dispose();
-				surface.Chunks.Remove(ch);
-			}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawImage(g, resourceTemplate.Bitmap, surface.GetBrushLocation(), false, null);
-		}
-
-		Random random = new Random();
-	}
-}
--- a/OpenRA.Editor/Surface.cs
+++ b/OpenRA.Editor/Surface.cs
@@ -1,573 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Traits;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	static class ActorReferenceExts
-	{
-		public static CPos Location(this ActorReference ar)
-		{
-			return (CPos)ar.InitDict.Get<LocationInit>().Value(null);
-		}
-
-		public static void DrawStringContrast(this SGraphics g, Font f, string s, int x, int y, Brush fg, Brush bg)
-		{
-			g.DrawString(s, f, bg, x - 1, y - 1);
-			g.DrawString(s, f, bg, x + 1, y - 1);
-			g.DrawString(s, f, bg, x - 1, y + 1);
-			g.DrawString(s, f, bg, x + 1, y + 1);
-
-			g.DrawString(s, f, fg, x, y);
-		}
-	}
-
-	class Surface : Control
-	{
-		public Map Map { get; private set; }
-		public TileSet TileSet { get; private set; }
-		public TileSetRenderer TileSetRenderer { get; private set; }
-		public IPalette Palette { get; private set; }
-		public IPalette PlayerPalette { get; private set; }
-		public int2 Offset;
-
-		public int2 GetOffset() { return Offset; }
-
-		public float Zoom = 1.0f;
-
-		ITool currentTool;
-
-		public bool IsPanning;
-		public bool IsErasing;
-		public bool ShowActorNames;
-		public bool ShowGrid;
-		public bool ShowRuler;
-
-		public bool IsPaste { get { return TileSelection != null && ResourceSelection != null; } }
-		public TerrainTile[,] TileSelection;
-		public ResourceTile[,] ResourceSelection;
-		public CPos SelectionStart;
-		public CPos SelectionEnd;
-
-		public string NewActorOwner;
-
-		public event Action AfterChange = () => { };
-		public event Action<string> MousePositionChanged = _ => { };
-		public event Action<KeyValuePair<string, ActorReference>> ActorDoubleClicked = _ => { };
-
-		Dictionary<string, ActorTemplate> actorTemplates = new Dictionary<string, ActorTemplate>();
-		public Dictionary<int, ResourceTemplate> ResourceTemplates = new Dictionary<int, ResourceTemplate>();
-
-		static readonly Font MarkerFont = new Font(FontFamily.GenericSansSerif, 12.0f, FontStyle.Regular);
-		static readonly SolidBrush TextBrush = new SolidBrush(Color.Red);
-
-		public Keys GetModifiers() { return ModifierKeys; }
-
-		public void Bind(Map m, TileSet ts, TileSetRenderer tsr, IPalette p, IPalette pp)
-		{
-			Map = m;
-			TileSet = ts;
-			TileSetRenderer = tsr;
-			Palette = p;
-			PlayerPalette = pp;
-			playerPalettes = null;
-			Chunks.Clear();
-			currentTool = null;
-		}
-
-		public void SetTool(ITool tool) { currentTool = tool; ClearSelection(); }
-
-		public void BindActorTemplates(IEnumerable<ActorTemplate> templates)
-		{
-			actorTemplates = templates.ToDictionary(a => a.Info.Name.ToLowerInvariant());
-		}
-
-		public void BindResourceTemplates(IEnumerable<ResourceTemplate> templates)
-		{
-			ResourceTemplates = templates.ToDictionary(a => a.Info.ResourceType);
-		}
-
-		public Dictionary<int2, Bitmap> Chunks = new Dictionary<int2, Bitmap>();
-
-		public Surface()
-		{
-			BackColor = Color.Black;
-
-			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
-			SetStyle(ControlStyles.ResizeRedraw, true);
-			UpdateStyles();
-		}
-
-		static readonly Pen SelectionPen = new Pen(Color.Blue);
-		static readonly Pen PastePen = new Pen(Color.Green);
-		static readonly Pen CordonPen = new Pen(Color.Red);
-
-		int2 mousePos;
-
-		public void Scroll(int2 dx)
-		{
-			Offset -= dx;
-			Invalidate();
-		}
-
-		protected override void OnDoubleClick(EventArgs e)
-		{
-			base.OnDoubleClick(e);
-
-			var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-			if (x.Key != null)
-				ActorDoubleClicked(x);
-		}
-
-		protected override void OnMouseWheel(MouseEventArgs e)
-		{
-			base.OnMouseWheel(e);
-
-			if (Map == null) return;
-
-			Zoom *= e.Delta > 0 ? 4.0f / 3.0f : .75f;
-
-			Invalidate();
-		}
-
-		protected override void OnMouseLeave(EventArgs e)
-		{
-			base.OnMouseLeave(e);
-
-			this.Parent.Focus();
-
-			Invalidate();
-		}
-
-		protected override void OnMouseEnter(EventArgs e)
-		{
-			base.OnMouseLeave(e);
-
-			this.Focus();
-
-			Invalidate();
-		}
-
-		protected override void OnMouseMove(MouseEventArgs e)
-		{
-			base.OnMouseMove(e);
-
-			if (Map == null) return;
-
-			var oldMousePos = mousePos;
-			mousePos = new int2(e.Location);
-			MousePositionChanged(GetBrushLocation().ToString());
-
-			if (e.Button == MouseButtons.Middle || (e.Button != MouseButtons.None && IsPanning))
-				Scroll(oldMousePos - mousePos);
-			else
-			{
-				if (e.Button == MouseButtons.Right || (IsErasing && e.Button == MouseButtons.Left))
-					Erase();
-
-				if (e.Button == MouseButtons.Left && !IsErasing)
-					Draw();
-
-				Invalidate();
-			}
-		}
-
-		void Erase()
-		{
-			// Crash preventing
-			var brushLocation = GetBrushLocation();
-
-			if (Map == null || brushLocation.X >= Map.MapSize.X ||
-				brushLocation.Y >= Map.MapSize.Y ||
-				brushLocation.X < 0 ||
-				brushLocation.Y < 0)
-				return;
-
-			currentTool = null;
-
-			var key = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == brushLocation);
-			if (key.Key != null) Map.Actors.Value.Remove(key.Key);
-
-			if (Map.MapResources.Value[brushLocation].Type != 0)
-			{
-				Map.MapResources.Value[brushLocation] = new ResourceTile(0, 0);
-				var ch = new int2(brushLocation.X / ChunkSize, brushLocation.Y / ChunkSize);
-				if (Chunks.ContainsKey(ch))
-				{
-					Chunks[ch].Dispose();
-					Chunks.Remove(ch);
-				}
-			}
-
-			AfterChange();
-			ClearSelection();
-		}
-
-		void Draw()
-		{
-			if (currentTool != null)
-			{
-				currentTool.Apply(this);
-				AfterChange();
-			}
-			else if (IsPaste)
-				PasteSelection();
-			else
-				SelectionEnd = GetBrushLocationBR();
-		}
-
-		protected override void OnMouseDown(MouseEventArgs e)
-		{
-			base.OnMouseDown(e);
-
-			if (Map == null) return;
-
-			if (!IsPanning)
-			{
-				if (e.Button == MouseButtons.Right) Erase();
-				if (e.Button == MouseButtons.Left && !IsErasing)
-				{
-					Draw();
-					if (!IsPaste)
-						SelectionStart = SelectionEnd = GetBrushLocation();
-				}
-			}
-
-			Invalidate();
-		}
-
-		public const int ChunkSize = 8;		// 8x8 chunks ==> 192x192 bitmaps.
-
-		Bitmap RenderChunk(int u, int v)
-		{
-			var bitmap = new Bitmap(ChunkSize * TileSetRenderer.TileSize, ChunkSize * TileSetRenderer.TileSize);
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var p = (int*)data.Scan0.ToPointer();
-				var stride = data.Stride >> 2;
-
-				for (var i = 0; i < ChunkSize; i++)
-					for (var j = 0; j < ChunkSize; j++)
-					{
-						var ui = u * ChunkSize + i;
-						var vj = v * ChunkSize + j;
-						var uv = new MPos(ui, vj);
-						var tr = Map.MapTiles.Value[uv];
-						var tile = TileSetRenderer.Data(tr.Type);
-						if (tile == null)
-							continue;
-
-						var index = (tr.Index < tile.Length) ? tr.Index : (byte)0;
-						var rawImage = tile[index];
-						for (var x = 0; x < TileSetRenderer.TileSize; x++)
-							for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] =
-									Palette.GetColor(rawImage[x + TileSetRenderer.TileSize * y]).ToArgb();
-
-						if (Map.MapResources.Value[uv].Type != 0)
-						{
-							var resourceImage = ResourceTemplates[Map.MapResources.Value[uv].Type].Bitmap;
-							var srcdata = resourceImage.LockBits(resourceImage.Bounds(),
-								ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-
-							var q = (int*)srcdata.Scan0.ToPointer();
-							var srcstride = srcdata.Stride >> 2;
-
-							for (var x = 0; x < TileSetRenderer.TileSize; x++)
-								for (var y = 0; y < TileSetRenderer.TileSize; y++)
-								{
-									var c = q[y * srcstride + x];
-									if ((c & 0xff000000) != 0)	/* quick & dirty, i cbf doing real alpha */
-										p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = c;
-								}
-
-							resourceImage.UnlockBits(srcdata);
-						}
-					}
-			}
-
-			bitmap.UnlockBits(data);
-
-			if (ShowGrid)
-			{
-				using (var g = SGraphics.FromImage(bitmap))
-				{
-					var ts = Game.ModData.Manifest.TileSize;
-					var rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
-					ControlPaint.DrawGrid(g, rect, new Size(2, ts.Height), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, 2), Color.DarkRed);
-					ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
-				}
-			}
-
-			return bitmap;
-		}
-
-		public CPos GetBrushLocation()
-		{
-			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
-			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos(vX / TileSetRenderer.TileSize, vY / TileSetRenderer.TileSize);
-		}
-
-		public CPos GetBrushLocationBR()
-		{
-			var vX = (int)Math.Floor((mousePos.X - Offset.X) / Zoom);
-			var vY = (int)Math.Floor((mousePos.Y - Offset.Y) / Zoom);
-			return new CPos(
-				(vX + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize,
-				(vY + TileSetRenderer.TileSize - 1) / TileSetRenderer.TileSize);
-		}
-
-		public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
-		{
-			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
-			var actorPalette = cp;
-			if (t.Appearance != null && t.Appearance.UseTerrainPalette)
-				actorPalette = Palette.AsSystemPalette();
-			DrawImage(g, t.Bitmap, p, centered, actorPalette);
-		}
-
-		float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)
-		{
-			float offsetX = centered ? bmp.Width / 2 - TileSetRenderer.TileSize / 2 : 0;
-			var drawX = TileSetRenderer.TileSize * location.X * Zoom + Offset.X - offsetX;
-
-			float offsetY = centered ? bmp.Height / 2 - TileSetRenderer.TileSize / 2 : 0;
-			var drawY = TileSetRenderer.TileSize * location.Y * Zoom + Offset.Y - offsetY;
-
-			return new float2(drawX, drawY);
-		}
-
-		public void DrawImage(SGraphics g, Bitmap bmp, CPos location, bool centered, ColorPalette cp)
-		{
-			var drawPos = GetDrawPosition(location, bmp, centered);
-
-			var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-			var destRect = new RectangleF(drawPos.X, drawPos.Y, bmp.Width * Zoom, bmp.Height * Zoom);
-
-			var restorePalette = bmp.Palette;
-			if (cp != null) bmp.Palette = cp;
-			g.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
-			if (cp != null) bmp.Palette = restorePalette;
-		}
-
-		void DrawActorBorder(SGraphics g, CPos p, ActorTemplate t)
-		{
-			var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
-			var drawPos = GetDrawPosition(p, t.Bitmap, centered);
-
-			g.DrawRectangle(CordonPen,
-				drawPos.X, drawPos.Y,
-				t.Bitmap.Width * Zoom, t.Bitmap.Height * Zoom);
-		}
-
-		ColorPalette GetPaletteForPlayerInner(string name)
-		{
-			var pr = Map.Players[name];
-			var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>();
-			var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
-			return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
-		}
-
-		Cache<string, ColorPalette> playerPalettes;
-
-		public ColorPalette GetPaletteForPlayer(string player)
-		{
-			if (playerPalettes == null)
-				playerPalettes = new Cache<string, ColorPalette>(GetPaletteForPlayerInner);
-
-			return playerPalettes[player];
-		}
-
-		ColorPalette GetPaletteForActor(ActorReference ar)
-		{
-			var ownerInit = ar.InitDict.GetOrDefault<OwnerInit>();
-			if (ownerInit == null)
-				return null;
-
-			return GetPaletteForPlayer(ownerInit.PlayerName);
-		}
-
-		protected override void OnPaint(PaintEventArgs e)
-		{
-			if (Map == null) return;
-			if (TileSet == null) return;
-
-			for (var u = 0; u < Map.MapSize.X; u += ChunkSize)
-				for (var v = 0; v < Map.MapSize.Y; v += ChunkSize)
-				{
-					var x = new int2(u / ChunkSize, v / ChunkSize);
-					if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
-
-					var bmp = Chunks[x];
-
-					var drawX = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.X * Zoom + Offset.X;
-					var drawY = TileSetRenderer.TileSize * (float)ChunkSize * (float)x.Y * Zoom + Offset.Y;
-					var sourceRect = new RectangleF(0, 0, bmp.Width, bmp.Height);
-					var destRect = new RectangleF(drawX, drawY, bmp.Width * Zoom, bmp.Height * Zoom);
-					e.Graphics.DrawImage(bmp, destRect, sourceRect, GraphicsUnit.Pixel);
-				}
-
-			e.Graphics.DrawRectangle(CordonPen,
-				Map.Bounds.Left * TileSetRenderer.TileSize * Zoom + Offset.X,
-				Map.Bounds.Top * TileSetRenderer.TileSize * Zoom + Offset.Y,
-				Map.Bounds.Width * TileSetRenderer.TileSize * Zoom,
-				Map.Bounds.Height * TileSetRenderer.TileSize * Zoom);
-
-			e.Graphics.DrawRectangle(SelectionPen,
-				(SelectionStart.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
-				(SelectionStart.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
-				(SelectionEnd - SelectionStart).X * TileSetRenderer.TileSize * Zoom,
-				(SelectionEnd - SelectionStart).Y * TileSetRenderer.TileSize * Zoom);
-
-			if (IsPaste)
-			{
-				var loc = GetBrushLocation();
-				var width = Math.Abs((SelectionStart - SelectionEnd).X);
-				var height = Math.Abs((SelectionStart - SelectionEnd).Y);
-
-				e.Graphics.DrawRectangle(PastePen,
-					(loc.X * TileSetRenderer.TileSize * Zoom) + Offset.X,
-					(loc.Y * TileSetRenderer.TileSize * Zoom) + Offset.Y,
-					width * (TileSetRenderer.TileSize * Zoom),
-					height * (TileSetRenderer.TileSize * Zoom));
-			}
-
-			foreach (var ar in Map.Actors.Value)
-			{
-				if (actorTemplates.ContainsKey(ar.Value.Type))
-					DrawActor(e.Graphics, ar.Value.Location(), actorTemplates[ar.Value.Type],
-						GetPaletteForActor(ar.Value));
-				else
-					Console.WriteLine("Warning: Unknown or excluded actor: {0}", ar.Value.Type);
-			}
-
-			if (ShowActorNames)
-				foreach (var ar in Map.Actors.Value)
-					if (!ar.Key.StartsWith("Actor"))	// if it has a custom name
-						e.Graphics.DrawStringContrast(Font, ar.Key,
-							(int)(ar.Value.Location().X * TileSetRenderer.TileSize * Zoom + Offset.X),
-							(int)(ar.Value.Location().Y * TileSetRenderer.TileSize * Zoom + Offset.Y),
-							Brushes.White,
-							Brushes.Black);
-
-			if (ShowRuler && Zoom > 0.2)
-			{
-				for (var i = Map.Bounds.Left; i <= Map.Bounds.Right; i += 8)
-				{
-					if (i % 8 == 0)
-					{
-						var point = new PointF(i * TileSetRenderer.TileSize * Zoom + Offset.X, (Map.Bounds.Top - 8) * TileSetRenderer.TileSize * Zoom + Offset.Y);
-						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
-					}
-				}
-
-				for (var i = Map.Bounds.Top; i <= Map.Bounds.Bottom; i += 8)
-				{
-					if (i % 8 == 0)
-					{
-						var point = new PointF((Map.Bounds.Left - 8) * TileSetRenderer.TileSize * Zoom + Offset.X, i * TileSetRenderer.TileSize * Zoom + Offset.Y);
-						e.Graphics.DrawString((i - Map.Bounds.Left).ToString(), MarkerFont, TextBrush, point);
-					}
-				}
-			}
-
-			if (currentTool != null)
-				currentTool.Preview(this, e.Graphics);
-
-			if (currentTool == null)
-			{
-				var x = Map.Actors.Value.FirstOrDefault(a => a.Value.Location() == GetBrushLocation());
-				if (x.Key != null && actorTemplates.ContainsKey(x.Value.Type))
-					DrawActorBorder(e.Graphics, x.Value.Location(), actorTemplates[x.Value.Type]);
-			}
-		}
-
-		public void CopySelection()
-		{
-			// Grab tiles and resources within selection (doesn't do actors)
-			var start = SelectionStart;
-			var end = SelectionEnd;
-
-			if (start == end) return;
-
-			var width = Math.Abs((start - end).X);
-			var height = Math.Abs((start - end).Y);
-
-			TileSelection = new TerrainTile[width, height];
-			ResourceSelection = new ResourceTile[width, height];
-
-			for (var x = 0; x < width; x++)
-			{
-				for (var y = 0; y < height; y++)
-				{
-					// TODO: crash prevention
-					var cell = new CPos(start.X + x, start.Y + y);
-					TileSelection[x, y] = Map.MapTiles.Value[cell];
-					ResourceSelection[x, y] = Map.MapResources.Value[cell];
-				}
-			}
-		}
-
-		void PasteSelection()
-		{
-			var loc = GetBrushLocation();
-			var width = Math.Abs((SelectionStart - SelectionEnd).X);
-			var height = Math.Abs((SelectionStart - SelectionEnd).Y);
-
-			for (var x = 0; x < width; x++)
-			{
-				for (var y = 0; y < height; y++)
-				{
-					var mapX = loc.X + x;
-					var mapY = loc.Y + y;
-					var cell = new CPos(mapX, mapY);
-
-					// TODO: crash prevention for outside of bounds
-					Map.MapTiles.Value[cell] = TileSelection[x, y];
-					Map.MapResources.Value[cell] = ResourceSelection[x, y];
-
-					var ch = new int2(mapX / ChunkSize, mapY / ChunkSize);
-					if (Chunks.ContainsKey(ch))
-					{
-						Chunks[ch].Dispose();
-						Chunks.Remove(ch);
-					}
-				}
-			}
-
-			AfterChange();
-		}
-
-		void ClearSelection()
-		{
-			SelectionStart = CPos.Zero;
-			SelectionEnd = CPos.Zero;
-			TileSelection = null;
-			ResourceSelection = null;
-		}
-	}
-}
--- a/OpenRA.Editor/TileSetRenderer.cs
+++ b/OpenRA.Editor/TileSetRenderer.cs
@@ -1,117 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using OpenRA.FileSystem;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public class TileSetRenderer
-	{
-		public readonly int TileSize;
-		public TileSet TileSet;
-		Dictionary<ushort, byte[][]> templates;
-
-		// Extract a square tile that the editor can render
-		byte[] ExtractSquareTile(ISpriteFrame frame)
-		{
-			var data = new byte[TileSize * TileSize];
-
-			// Invalid tile size: return blank tile
-			if (frame.Size.Width < TileSize || frame.Size.Height < TileSize)
-				return new byte[0];
-
-			var frameData = frame.Data;
-			var xOffset = (frame.Size.Width - TileSize) / 2;
-			var yOffset = (frame.Size.Height - TileSize) / 2;
-
-			for (var y = 0; y < TileSize; y++)
-				for (var x = 0; x < TileSize; x++)
-					data[y * TileSize + x] = frameData[(yOffset + y) * frame.Size.Width + x + xOffset];
-
-			return data;
-		}
-
-		public TileSetRenderer(TileSet tileset, Size tileSize)
-		{
-			this.TileSet = tileset;
-			this.TileSize = Math.Min(tileSize.Width, tileSize.Height);
-
-			templates = new Dictionary<ushort, byte[][]>();
-			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
-			foreach (var t in tileset.Templates)
-			{
-				var allFrames = frameCache[t.Value.Images[0]];
-				var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
-				templates.Add(t.Value.Id, frames.Select(f => ExtractSquareTile(f)).ToArray());
-			}
-		}
-
-		public Bitmap RenderTemplate(ushort id, IPalette p)
-		{
-			var template = TileSet.Templates[id];
-			var templateData = templates[id];
-
-			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				var q = (byte*)data.Scan0.ToPointer();
-				var stride = data.Stride;
-
-				for (var u = 0; u < template.Size.X; u++)
-				{
-					for (var v = 0; v < template.Size.Y; v++)
-					{
-						var rawImage = templateData[u + v * template.Size.X];
-						if (rawImage != null && rawImage.Length > 0)
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
-						}
-						else
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
-						}
-					}
-				}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public byte[][] Data(ushort id)
-		{
-			byte[][] template;
-			if (!templates.TryGetValue(id, out template))
-			{
-				Console.WriteLine("warning: Unknown tile template {0}", id);
-				return null;
-			}
-
-			return template;
-		}
-	}
-}
--- a/OpenRA.Game.exe.config
+++ b/OpenRA.Game.exe.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
+</configuration>
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -22,69 +22,52 @@ using OpenRA.Traits;

 namespace OpenRA
 {
-	public interface IActor
-	{
-		ActorInfo Info { get; }
-		IWorld World { get; }
-		uint ActorID { get; }
-		Player Owner { get; set; }
-
-		T TraitOrDefault<T>();
-		T Trait<T>();
-		IEnumerable<T> TraitsImplementing<T>();
-
-		IEnumerable<IRenderable> Render(WorldRenderer wr);
-	}
-
-	public class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IActor
+	public sealed class Actor : IScriptBindable, IScriptNotifyBind, ILuaTableBinding, ILuaEqualityBinding, ILuaToStringBinding, IEquatable<Actor>, IDisposable
 	{
 		public readonly ActorInfo Info;
-		ActorInfo IActor.Info { get { return this.Info; } }

 		public readonly World World;
-		IWorld IActor.World { get { return World; } }

 		public readonly uint ActorID;
-		uint IActor.ActorID { get { return this.ActorID; } }

-		[Sync] public Player Owner { get; set; }
+		public Player Owner { get; set; }

 		public bool IsInWorld { get; internal set; }
-		public bool Destroyed { get; private set; }
+		public bool Disposed { get; private set; }

 		Activity currentActivity;

 		public Group Group;
 		public int Generation;

-		Lazy<Rectangle> bounds;
-		Lazy<IFacing> facing;
-		Lazy<Health> health;
-		Lazy<IOccupySpace> occupySpace;
-		Lazy<IEffectiveOwner> effectiveOwner;
-
-		public Rectangle Bounds { get { return bounds.Value; } }
-		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
-		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
+		public Rectangle Bounds { get; private set; }
+		public Rectangle VisualBounds { get; private set; }
+		public IEffectiveOwner EffectiveOwner { get; private set; }
+		public IOccupySpace OccupiesSpace { get; private set; }

 		public bool IsIdle { get { return currentActivity == null; } }
-		public bool IsDead { get { return Destroyed || (health.Value == null ? false : health.Value.IsDead); } }
+		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }

-		public CPos Location { get { return occupySpace.Value.TopLeft; } }
-		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
+		public CPos Location { get { return OccupiesSpace.TopLeft; } }
+		public WPos CenterPosition { get { return OccupiesSpace.CenterPosition; } }

 		public WRot Orientation
 		{
 			get
 			{
 				// TODO: Support non-zero pitch/roll in IFacing (IOrientation?)
-				var facingValue = facing.Value != null ? facing.Value.Facing : 0;
+				var facingValue = facing != null ? facing.Facing : 0;
 				return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue));
 			}
 		}

-		readonly IRenderModifier[] traitsImplementingRenderModifier;
-		readonly IRender[] traitsImplementingRender;
+		readonly IFacing facing;
+		readonly IHealth health;
+		readonly IRenderModifier[] renderModifiers;
+		readonly IRender[] renders;
+		readonly IDisable[] disables;
+		readonly IVisibilityModifier[] visibilityModifiers;
+		readonly IDefaultVisibility defaultVisibility;

 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -95,8 +78,6 @@ namespace OpenRA
 			if (initDict.Contains<OwnerInit>())
 				Owner = init.Get<OwnerInit, Player>();

-			occupySpace = Exts.Lazy(() => TraitOrDefault<IOccupySpace>());
-
 			if (name != null)
 			{
 				name = name.ToLowerInvariant();
@@ -106,28 +87,54 @@ namespace OpenRA

 				Info = world.Map.Rules.Actors[name];
 				foreach (var trait in Info.TraitsInConstructOrder())
+				{
 					AddTrait(trait.Create(init));
+
+					// Some traits rely on properties provided by IOccupySpace in their initialization,
+					// so we must ready it now, we cannot wait until all traits have finished construction.
+					if (trait is IOccupySpaceInfo)
+						OccupiesSpace = Trait<IOccupySpace>();
+				}
 			}

-			facing = Exts.Lazy(() => TraitOrDefault<IFacing>());
-			health = Exts.Lazy(() => TraitOrDefault<Health>());
-			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
+			Bounds = DetermineBounds();
+			VisualBounds = DetermineVisualBounds();
+			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
+			facing = TraitOrDefault<IFacing>();
+			health = TraitOrDefault<IHealth>();
+			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
+			renders = TraitsImplementing<IRender>().ToArray();
+			disables = TraitsImplementing<IDisable>().ToArray();
+			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
+			defaultVisibility = Trait<IDefaultVisibility>();
+		}

-			bounds = Exts.Lazy(() =>
-			{
-				var si = Info.Traits.GetOrDefault<SelectableInfo>();
-				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-					TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
+		Rectangle DetermineBounds()
+		{
+			var si = Info.TraitInfoOrDefault<SelectableInfo>();
+			var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
+				TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();

-				var offset = -size / 2;
-				if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-					offset += new int2(si.Bounds[2], si.Bounds[3]);
+			var offset = -size / 2;
+			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
+				offset += new int2(si.Bounds[2], si.Bounds[3]);

-				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-			});
+			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+		}

-			traitsImplementingRenderModifier = TraitsImplementing<IRenderModifier>().ToArray();
-			traitsImplementingRender = TraitsImplementing<IRender>().ToArray();
+		Rectangle DetermineVisualBounds()
+		{
+			var sd = Info.TraitInfoOrDefault<ISelectionDecorationsInfo>();
+			if (sd == null || sd.SelectionBoxBounds == null)
+				return Bounds;
+
+			var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
+
+			var offset = -size / 2;
+			if (sd.SelectionBoxBounds.Length > 2)
+				offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
+
+			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
 		}

 		public void Tick()
@@ -143,14 +150,14 @@ namespace OpenRA
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
 			var renderables = Renderables(wr);
-			foreach (var modifier in traitsImplementingRenderModifier)
+			foreach (var modifier in renderModifiers)
 				renderables = modifier.ModifyRender(this, wr, renderables);
 			return renderables;
 		}

 		IEnumerable<IRenderable> Renderables(WorldRenderer wr)
 		{
-			foreach (var render in traitsImplementingRender)
+			foreach (var render in renders)
 				foreach (var renderable in render.Render(this, wr))
 					yield return renderable;
 		}
@@ -220,28 +227,26 @@ namespace OpenRA
 			return World.TraitDict.WithInterface<T>(this);
 		}

-		public bool HasTrait<T>()
-		{
-			return World.TraitDict.Contains<T>(this);
-		}
-
 		public void AddTrait(object trait)
 		{
 			World.TraitDict.AddTrait(this, trait);
 		}

-		public void Destroy()
+		public void Dispose()
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed)
+				if (Disposed)
 					return;

 				if (IsInWorld)
 					World.Remove(this);

+				foreach (var t in TraitsImplementing<INotifyActorDisposing>())
+					t.Disposing(this);
+
 				World.TraitDict.RemoveActor(this);
-				Destroyed = true;
+				Disposed = true;

 				if (luaInterface != null)
 					luaInterface.Value.OnActorDestroyed();
@@ -253,28 +258,66 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed)
+				if (Disposed)
 					return;

 				var oldOwner = Owner;
+				var wasInWorld = IsInWorld;

 				// momentarily remove from world so the ownership queries don't get confused
-				w.Remove(this);
+				if (wasInWorld)
+					w.Remove(this);
+
 				Owner = newOwner;
 				Generation++;
-				w.Add(this);
+
+				if (wasInWorld)
+					w.Add(this);

 				foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
 					t.OnOwnerChanged(this, oldOwner, newOwner);
 			});
 		}

-		public void Kill(Actor attacker)
+		public DamageState GetDamageState()
 		{
-			if (health.Value == null)
+			if (Disposed)
+				return DamageState.Dead;
+
+			return (health == null) ? DamageState.Undamaged : health.DamageState;
+		}
+
+		public void InflictDamage(Actor attacker, int damage, IWarhead warhead)
+		{
+			if (Disposed || health == null)
 				return;

-			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
+			health.InflictDamage(this, attacker, damage, warhead, false);
+		}
+
+		public void Kill(Actor attacker)
+		{
+			if (Disposed || health == null)
+				return;
+
+			health.Kill(this, attacker);
+		}
+
+		public bool IsDisabled()
+		{
+			foreach (var disable in disables)
+				if (disable.Disabled)
+					return true;
+			return false;
+		}
+
+		public bool CanBeViewedByPlayer(Player player)
+		{
+			foreach (var visibilityModifier in visibilityModifiers)
+				if (!visibilityModifier.IsVisible(this, player))
+					return false;
+
+			return defaultVisibility.IsVisible(this, player);
 		}

 		#region Scripting interface
--- a/OpenRA.Game/CPos.cs
+++ b/OpenRA.Game/CPos.cs
@@ -44,15 +44,15 @@ namespace OpenRA

 		public MPos ToMPos(Map map)
 		{
-			return ToMPos(map.TileShape);
+			return ToMPos(map.Grid.Type);
 		}

-		public MPos ToMPos(TileShape shape)
+		public MPos ToMPos(MapGridType gridType)
 		{
-			if (shape == TileShape.Rectangle)
+			if (gridType == MapGridType.Rectangular)
 				return new MPos(X, Y);

-			// Convert from diamond cell (x, y) position to rectangular map position (u, v)
+			// Convert from RectangularIsometric cell (x, y) position to rectangular map position (u, v)
 			//  - The staggered rows make this fiddly (hint: draw a diagram!)
 			// (a) Consider the relationships:
 			//  - +1x (even -> odd) adds (0, 1) to (u, v)
--- a/OpenRA.Game/ContentInstaller.cs
+++ b/OpenRA.Game/ContentInstaller.cs
@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA
+{
+	// Referenced from ModMetadata, so needs to be in OpenRA.Game :(
+	public class ContentInstaller : IGlobalModData
+	{
+		public readonly string[] TestFiles = { };
+		public readonly string[] DiskTestFiles = { };
+		public readonly string PackageToExtractFromCD = null;
+		public readonly bool OverwriteFiles = true;
+
+		public readonly Dictionary<string, string[]> CopyFilesFromCD = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> ExtractFilesFromCD = new Dictionary<string, string[]>();
+
+		public readonly string PackageMirrorList = null;
+
+		public readonly string MusicPackageMirrorList = null;
+		public readonly int ShippedSoundtracks = 0;
+
+		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific files. </summary>
+		public readonly HashSet<int> InstallShieldCABFileIds = new HashSet<int>();
+
+		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific archives and extract contents of ExtractFilesFromCD. </summary>
+		public readonly HashSet<string> InstallShieldCABFilePackageIds = new HashSet<string>();
+	}
+}
--- a/OpenRA.Game/Effects/DelayedAction.cs
+++ b/OpenRA.Game/Effects/DelayedAction.cs
--- a/OpenRA.Game/Effects/FlashTarget.cs
+++ b/OpenRA.Game/Effects/FlashTarget.cs
--- a/OpenRA.Game/Effects/IEffect.cs
+++ b/OpenRA.Game/Effects/IEffect.cs
--- a/OpenRA.Game/Effects/SpriteEffect.cs
+++ b/OpenRA.Game/Effects/SpriteEffect.cs
@@ -15,15 +15,15 @@ namespace OpenRA.Effects
 {
 	public class SpriteEffect : IEffect
 	{
-		string palette;
-		Animation anim;
-		WPos pos;
+		readonly string palette;
+		readonly Animation anim;
+		readonly WPos pos;

-		public SpriteEffect(WPos pos, World world, string sprite, string palette)
+		public SpriteEffect(WPos pos, World world, string image, string palette)
 		{
 			this.pos = pos;
 			this.palette = palette;
-			anim = new Animation(world, sprite);
+			anim = new Animation(world, image);
 			anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
 		}

--- a/OpenRA.Game/FieldLoader.cs
+++ b/OpenRA.Game/FieldLoader.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -23,9 +24,29 @@ namespace OpenRA
 {
 	public static class FieldLoader
 	{
+		public class MissingFieldsException : YamlException
+		{
+			public readonly string[] Missing;
+			public readonly string Header;
+			public override string Message
+			{
+				get
+				{
+					return (string.IsNullOrEmpty(Header) ? "" : Header + ": ") + Missing[0]
+						+ string.Concat(Missing.Skip(1).Select(m => ", " + m));
+				}
+			}
+
+			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null) : base(null)
+			{
+				Header = missing.Length > 1 ? header : headerSingle ?? header;
+				Missing = missing;
+			}
+		}
+
 		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
 		{
-			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
+			throw new YamlException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
 		};

 		public static Action<string, Type> UnknownFieldAction = (s, f) =>
@@ -33,9 +54,18 @@ namespace OpenRA
 			throw new NotImplementedException("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
 		};

+		static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
+			new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
+		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
+			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
+
+		static readonly object TranslationsLock = new object();
+		static Dictionary<string, string> translations;
+
 		public static void Load(object self, MiniYaml my)
 		{
-			var loadInfo = typeLoadInfo[self.GetType()];
+			var loadInfo = TypeLoadInfo[self.GetType()];
+			var missing = new List<string>();

 			Dictionary<string, MiniYaml> md = null;

@@ -43,19 +73,33 @@ namespace OpenRA
 			{
 				object val;

+				if (md == null)
+					md = my.ToDictionary();
 				if (fli.Loader != null)
-					val = fli.Loader(my);
+				{
+					if (!fli.Attribute.Required || md.ContainsKey(fli.YamlName))
+						val = fli.Loader(my);
+					else
+					{
+						missing.Add(fli.YamlName);
+						continue;
+					}
+				}
 				else
 				{
-					if (md == null)
-						md = my.ToDictionary();
-
 					if (!TryGetValueFromYaml(fli.YamlName, fli.Field, md, out val))
+					{
+						if (fli.Attribute.Required)
+							missing.Add(fli.YamlName);
 						continue;
+					}
 				}

 				fli.Field.SetValue(self, val);
 			}
+
+			if (missing.Any())
+				throw new MissingFieldsException(missing.ToArray());
 		}

 		static bool TryGetValueFromYaml(string yamlName, FieldInfo field, Dictionary<string, MiniYaml> md, out object ret)
@@ -66,13 +110,8 @@ namespace OpenRA
 			if (!md.TryGetValue(yamlName, out yaml))
 				return false;

-			if (yaml.Nodes.Count == 0)
-			{
-				ret = GetValue(field.Name, field.FieldType, yaml.Value, field);
-				return true;
-			}
-
-			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(yamlName, field.FieldType));
+			ret = GetValue(field.Name, field.FieldType, yaml, field);
+			return true;
 		}

 		public static T Load<T>(MiniYaml y) where T : new()
@@ -82,7 +121,6 @@ namespace OpenRA
 			return t;
 		}

-		static readonly object[] NoIndexes = { };
 		public static void LoadField(object target, string key, string value)
 		{
 			const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
@@ -103,7 +141,7 @@ namespace OpenRA
 			{
 				var sa = prop.GetCustomAttributes<SerializeAttribute>(false).DefaultIfEmpty(SerializeAttribute.Default).First();
 				if (!sa.FromYamlKey)
-					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), NoIndexes);
+					prop.SetValue(target, GetValue(prop.Name, prop.PropertyType, value, prop), null);
 				return;
 			}

@@ -122,6 +160,12 @@ namespace OpenRA

 		public static object GetValue(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
+			return GetValue(fieldName, fieldType, new MiniYaml(value), field);
+		}
+
+		public static object GetValue(string fieldName, Type fieldType, MiniYaml yaml, MemberInfo field)
+		{
+			var value = yaml.Value;
 			if (value != null) value = value.Trim();

 			if (fieldType == typeof(int))
@@ -149,69 +193,81 @@ namespace OpenRA
 			else if (fieldType == typeof(float))
 			{
 				float res;
-				if (float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && float.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01f : 1f);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(decimal))
 			{
 				decimal res;
-				if (decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+				if (value != null && decimal.TryParse(value.Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
 					return res * (value.Contains('%') ? 0.01m : 1m);
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(string))
 			{
-				if (field != null && field.HasAttribute<TranslateAttribute>())
+				if (field != null && MemberHasTranslateAttribute[field] && value != null)
 					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
 				return value;
 			}
 			else if (fieldType == typeof(Color))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
-					return Color.FromArgb(
-						Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
-				if (parts.Length == 4)
-					return Color.FromArgb(
-						Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
+				if (value != null)
+				{
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+						return Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+					if (parts.Length == 4)
+						return Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
+				}
+
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(Color[]))
 			{
-				var parts = value.Split(',');
-
-				if (parts.Length % 4 != 0)
-					return InvalidValueAction(value, fieldType, fieldName);
-
-				var colors = new Color[parts.Length / 4];
-
-				for (var i = 0; i < colors.Length; i++)
+				if (value != null)
 				{
-					colors[i] = Color.FromArgb(
-						Exts.ParseIntegerInvariant(parts[4 * i]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[4 * i + 1]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[4 * i + 2]).Clamp(0, 255),
-						Exts.ParseIntegerInvariant(parts[4 * i + 3]).Clamp(0, 255));
+					var parts = value.Split(',');
+
+					if (parts.Length % 4 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var colors = new Color[parts.Length / 4];
+
+					for (var i = 0; i < colors.Length; i++)
+					{
+						colors[i] = Color.FromArgb(
+							Exts.ParseIntegerInvariant(parts[4 * i]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 1]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 2]).Clamp(0, 255),
+							Exts.ParseIntegerInvariant(parts[4 * i + 3]).Clamp(0, 255));
+					}
+
+					return colors;
 				}

-				return colors;
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(HSLColor))
 			{
-				var parts = value.Split(',');
+				if (value != null)
+				{
+					var parts = value.Split(',');

-				// Allow old ColorRamp format to be parsed as HSLColor
-				if (parts.Length == 3 || parts.Length == 4)
-					return new HSLColor(
-						(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-						(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-						(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+					// Allow old ColorRamp format to be parsed as HSLColor
+					if (parts.Length == 3 || parts.Length == 4)
+						return new HSLColor(
+							(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
+							(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
+							(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
+				}

 				return InvalidValueAction(value, fieldType, fieldName);
 			}
@@ -223,54 +279,63 @@ namespace OpenRA

 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(WRange))
+			else if (fieldType == typeof(WDist))
 			{
-				WRange res;
-				if (WRange.TryParse(value, out res))
+				WDist res;
+				if (WDist.TryParse(value, out res))
 					return res;

 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(WVec))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
+				if (value != null)
 				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WVec(rx, ry, rz);
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+							return new WVec(rx, ry, rz);
+					}
 				}

 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(WVec[]))
 			{
-				var parts = value.Split(',');
-
-				if (parts.Length % 3 != 0)
-					return InvalidValueAction(value, fieldType, fieldName);
-
-				var vecs = new WVec[parts.Length / 3];
-
-				for (var i = 0; i < vecs.Length; ++i)
+				if (value != null)
 				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[3 * i], out rx)
-							&& WRange.TryParse(parts[3 * i + 1], out ry)
-							&& WRange.TryParse(parts[3 * i + 2], out rz))
-						vecs[i] = new WVec(rx, ry, rz);
+					var parts = value.Split(',');
+
+					if (parts.Length % 3 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var vecs = new WVec[parts.Length / 3];
+
+					for (var i = 0; i < vecs.Length; ++i)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[3 * i], out rx) && WDist.TryParse(parts[3 * i + 1], out ry) && WDist.TryParse(parts[3 * i + 2], out rz))
+							vecs[i] = new WVec(rx, ry, rz);
+					}
+
+					return vecs;
 				}

-				return vecs;
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(WPos))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
+				if (value != null)
 				{
-					WRange rx, ry, rz;
-					if (WRange.TryParse(parts[0], out rx) && WRange.TryParse(parts[1], out ry) && WRange.TryParse(parts[2], out rz))
-						return new WPos(rx, ry, rz);
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						WDist rx, ry, rz;
+						if (WDist.TryParse(parts[0], out rx) && WDist.TryParse(parts[1], out ry) && WDist.TryParse(parts[2], out rz))
+							return new WPos(rx, ry, rz);
+					}
 				}

 				return InvalidValueAction(value, fieldType, fieldName);
@@ -284,31 +349,38 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(WRot))
 			{
-				var parts = value.Split(',');
-				if (parts.Length == 3)
+				if (value != null)
 				{
-					int rr, rp, ry;
-					if (Exts.TryParseIntegerInvariant(value, out rr)
-						&& Exts.TryParseIntegerInvariant(value, out rp)
-						&& Exts.TryParseIntegerInvariant(value, out ry))
-						return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
+					var parts = value.Split(',');
+					if (parts.Length == 3)
+					{
+						int rr, rp, ry;
+						if (Exts.TryParseIntegerInvariant(value, out rr) && Exts.TryParseIntegerInvariant(value, out rp) && Exts.TryParseIntegerInvariant(value, out ry))
+							return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
+					}
 				}

 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(CPos))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CPos(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new CPos(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(CVec))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new CVec(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new CVec(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType.IsEnum)
 			{
@@ -321,9 +393,32 @@ namespace OpenRA
 					return InvalidValueAction(value, fieldType, fieldName);
 				}
 			}
+			else if (fieldType == typeof(ImageFormat))
+			{
+				if (value != null)
+				{
+					switch (value.ToLowerInvariant())
+					{
+					case "bmp":
+						return ImageFormat.Bmp;
+					case "gif":
+						return ImageFormat.Gif;
+					case "jpg":
+					case "jpeg":
+						return ImageFormat.Jpeg;
+					case "tif":
+					case "tiff":
+						return ImageFormat.Tiff;
+					default:
+						return ImageFormat.Png;
+					}
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
+			}
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
-			else if (fieldType.IsArray)
+			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
 					return Array.CreateInstance(fieldType.GetElementType(), 0);
@@ -335,47 +430,95 @@ namespace OpenRA
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(HashSet<>))
+			{
+				var set = Activator.CreateInstance(fieldType);
+				if (value == null)
+					return set;
+
+				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var addMethod = fieldType.GetMethod("Add", fieldType.GetGenericArguments());
+				for (var i = 0; i < parts.Length; i++)
+					addMethod.Invoke(set, new[] { GetValue(fieldName, fieldType.GetGenericArguments()[0], parts[i].Trim(), field) });
+				return set;
+			}
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+			{
+				var dict = Activator.CreateInstance(fieldType);
+				var arguments = fieldType.GetGenericArguments();
+				var addMethod = fieldType.GetMethod("Add", arguments);
+
+				foreach (var node in yaml.Nodes)
+				{
+					var key = GetValue(fieldName, arguments[0], node.Key, field);
+					var val = GetValue(fieldName, arguments[1], node.Value, field);
+					addMethod.Invoke(dict, new[] { key, val });
+				}
+
+				return dict;
+			}
 			else if (fieldType == typeof(Size))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Size(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new Size(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(int2))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]));
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new int2(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(float2))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				float xx = 0;
-				float yy = 0;
-				float res;
-				if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
-					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-				if (float.TryParse(parts[1].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
-					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-				return new float2(xx, yy);
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					float xx = 0;
+					float yy = 0;
+					float res;
+					if (float.TryParse(parts[0].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+						xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
+					if (float.TryParse(parts[1].Replace("%", ""), NumberStyles.Float, NumberFormatInfo.InvariantInfo, out res))
+						yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
+					return new float2(xx, yy);
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(Rectangle))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Rectangle(
-					Exts.ParseIntegerInvariant(parts[0]),
-					Exts.ParseIntegerInvariant(parts[1]),
-					Exts.ParseIntegerInvariant(parts[2]),
-					Exts.ParseIntegerInvariant(parts[3]));
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					return new Rectangle(
+						Exts.ParseIntegerInvariant(parts[0]),
+						Exts.ParseIntegerInvariant(parts[1]),
+						Exts.ParseIntegerInvariant(parts[2]),
+						Exts.ParseIntegerInvariant(parts[3]));
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
 			{
-				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				var argTypes = new Type[] { typeof(string[]) };
-				var argValues = new object[] { parts };
-				return fieldType.GetConstructor(argTypes).Invoke(argValues);
+				if (value != null)
+				{
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					var argTypes = new Type[] { typeof(string[]) };
+					var argValues = new object[] { parts };
+					return fieldType.GetConstructor(argTypes).Invoke(argValues);
+				}
+
+				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Nullable<>))
 			{
@@ -412,11 +555,15 @@ namespace OpenRA

 		static object ParseYesNo(string p, Type fieldType, string field)
 		{
+			if (string.IsNullOrEmpty(p))
+				return InvalidValueAction(p, fieldType, field);
+
 			p = p.ToLowerInvariant();
 			if (p == "yes") return true;
 			if (p == "true") return true;
 			if (p == "no") return false;
 			if (p == "false") return false;
+
 			return InvalidValueAction(p, fieldType, field);
 		}

@@ -438,12 +585,10 @@ namespace OpenRA

 		public static IEnumerable<FieldLoadInfo> GetTypeLoadInfo(Type type, bool includePrivateByDefault = false)
 		{
-			return typeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
+			return TypeLoadInfo[type].Where(fli => includePrivateByDefault || fli.Field.IsPublic || (fli.Attribute.Serialize && !fli.Attribute.IsDefault));
 		}

-		static Cache<Type, List<FieldLoadInfo>> typeLoadInfo = new Cache<Type, List<FieldLoadInfo>>(BuildTypeLoadInfo);
-
-		static List<FieldLoadInfo> BuildTypeLoadInfo(Type type)
+		static FieldLoadInfo[] BuildTypeLoadInfo(Type type)
 		{
 			var ret = new List<FieldLoadInfo>();

@@ -459,13 +604,13 @@ namespace OpenRA

 				var loader = sa.GetLoader(type);
 				if (loader == null && sa.FromYamlKey)
-					loader = (yaml) => GetValue(yamlName, field.FieldType, yaml.Value, field);
+					loader = yaml => GetValue(yamlName, field.FieldType, yaml, field);

 				var fli = new FieldLoadInfo(field, sa, yamlName, loader);
 				ret.Add(fli);
 			}

-			return ret;
+			return ret.ToArray();
 		}

 		[AttributeUsage(AttributeTargets.Field)]
@@ -475,12 +620,20 @@ namespace OpenRA
 				: base(false) { }
 		}

+		[AttributeUsage(AttributeTargets.Field)]
+		public sealed class RequireAttribute : SerializeAttribute
+		{
+			public RequireAttribute()
+				: base(true, true) { }
+		}
+
 		[AttributeUsage(AttributeTargets.Field)]
 		public sealed class LoadUsingAttribute : SerializeAttribute
 		{
-			public LoadUsingAttribute(string loader)
+			public LoadUsingAttribute(string loader, bool required = false)
 			{
 				Loader = loader;
+				Required = required;
 			}
 		}

@@ -495,10 +648,13 @@ namespace OpenRA
 			public string YamlName;
 			public string Loader;
 			public bool FromYamlKey;
+			public bool DictionaryFromYamlKey;
+			public bool Required;

-			public SerializeAttribute(bool serialize = true)
+			public SerializeAttribute(bool serialize = true, bool required = false)
 			{
 				Serialize = serialize;
+				Required = required;
 			}

 			internal Func<MiniYaml, object> GetLoader(Type type)
@@ -520,17 +676,27 @@ namespace OpenRA

 		public static string Translate(string key)
 		{
-			if (Translations == null || string.IsNullOrEmpty(key))
+			if (string.IsNullOrEmpty(key))
 				return key;

-			string value;
-			if (!Translations.TryGetValue(key, out value))
-				return key;
+			lock (TranslationsLock)
+			{
+				if (translations == null)
+					return key;

-			return value;
+				string value;
+				if (!translations.TryGetValue(key, out value))
+					return key;
+
+				return value;
+			}
 		}

-		public static Dictionary<string, string> Translations = new Dictionary<string, string>();
+		public static void SetTranslations(IDictionary<string, string> translations)
+		{
+			lock (TranslationsLock)
+				FieldLoader.translations = new Dictionary<string, string>(translations);
+		}
 	}

 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
@@ -545,7 +711,19 @@ namespace OpenRA
 		}
 	}

+	// Special-cases FieldFromYamlKeyAttribute for use with Dictionary<K,V>.
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class DictionaryFromYamlKeyAttribute : FieldLoader.SerializeAttribute
+	{
+		public DictionaryFromYamlKeyAttribute()
+		{
+			FromYamlKey = true;
+			DictionaryFromYamlKey = true;
+		}
+	}
+
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
+	[AttributeUsage(AttributeTargets.All)]
 	public sealed class DescAttribute : Attribute
 	{
 		public readonly string[] Lines;
--- a/OpenRA.Game/FieldSaver.cs
+++ b/OpenRA.Game/FieldSaver.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
@@ -27,7 +28,18 @@ namespace OpenRA

 			foreach (var info in FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault))
 			{
-				if (info.Attribute.FromYamlKey)
+				if (info.Attribute.DictionaryFromYamlKey)
+				{
+					var dict = (System.Collections.IDictionary)info.Field.GetValue(o);
+					foreach (var kvp in dict)
+					{
+						var key = ((System.Collections.DictionaryEntry)kvp).Key;
+						var value = ((System.Collections.DictionaryEntry)kvp).Value;
+
+						nodes.Add(new MiniYamlNode(FormatValue(key), FormatValue(value)));
+					}
+				}
+				else if (info.Attribute.FromYamlKey)
 					root = FormatValue(o, info.Field);
 				else
 					nodes.Add(new MiniYamlNode(info.YamlName, FormatValue(o, info.Field)));
@@ -54,11 +66,13 @@ namespace OpenRA
 			return new MiniYamlNode(field, FormatValue(o, o.GetType().GetField(field)));
 		}

-		public static string FormatValue(object v, Type t)
+		public static string FormatValue(object v)
 		{
 			if (v == null)
 				return "";

+			var t = v.GetType();
+
 			// Color.ToString() does the wrong thing; force it to format as an array
 			if (t == typeof(Color))
 			{
@@ -69,13 +83,10 @@ namespace OpenRA
 					((int)c.B).Clamp(0, 255));
 			}

-			// Don't save using country-specific decimal separators which can be misunderstood as group seperators.
-			if (t == typeof(float))
-				return ((float)v).ToString(CultureInfo.InvariantCulture);
-			if (t == typeof(decimal))
-				return ((decimal)v).ToString(CultureInfo.InvariantCulture);
-			if (t == typeof(double))
-				return ((double)v).ToString(CultureInfo.InvariantCulture);
+			if (t == typeof(ImageFormat))
+			{
+				return ((ImageFormat)v).ToString();
+			}

 			if (t == typeof(Rectangle))
 			{
@@ -83,10 +94,33 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}

-			if (t.IsArray)
+			if (t.IsArray && t.GetArrayRank() == 1)
 			{
-				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(", ");
+				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");
+			}
+
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(HashSet<>))
+			{
+				return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", ");
+			}
+
+			// This is only for documentation generation
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+			{
+				var result = "";
+				var dict = (System.Collections.IDictionary)v;
+				foreach (var kvp in dict)
+				{
+					var key = ((System.Collections.DictionaryEntry)kvp).Key;
+					var value = ((System.Collections.DictionaryEntry)kvp).Value;
+
+					var formattedKey = FormatValue(key);
+					var formattedValue = FormatValue(value);
+
+					result += "{0}: {1}{2}".F(formattedKey, formattedValue, Environment.NewLine);
+				}
+
+				return result;
 			}

 			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
@@ -113,7 +147,7 @@ namespace OpenRA

 		public static string FormatValue(object o, FieldInfo f)
 		{
-			return FormatValue(f.GetValue(o), f.FieldType);
+			return FormatValue(f.GetValue(o));
 		}
 	}
 }
--- a/OpenRA.Game/FileFormats/BlowfishKeyProvider.cs
+++ b/OpenRA.Game/FileFormats/BlowfishKeyProvider.cs
@@ -119,12 +119,6 @@ namespace OpenRA.FileFormats
 			pubkey.Len = BitLenBigNum(pubkey.KeyOne, 64) - 1;
 		}

-		uint LenPreData()
-		{
-			var a = (pubkey.Len - 1) / 8;
-			return (55 / a + 1) * (a + 1);
-		}
-
 		static int CompareBigNum(uint[] n1, uint[] n2, uint len)
 		{
 			while (len > 0)
@@ -462,46 +456,37 @@ namespace OpenRA.FileFormats
 			}
 		}

-		static unsafe void Memcopy(byte* dest, byte* src, int len)
-		{
-			while (len-- != 0) *dest++ = *src++;
-		}
-
-		unsafe void ProcessPredata(byte* pre, uint pre_len, byte* buf)
+		byte[] ProcessPredata(byte[] src)
 		{
+			var dest = new byte[256];
 			var n2 = new uint[64];
 			var n3 = new uint[64];

-			var a = (pubkey.Len - 1) / 8;
+			var a = (int)((pubkey.Len - 1) / 8);
+			var pre_len = (55 / a + 1) * (a + 1);
+			var srcOffset = 0;
+			var destOffset = 0;
+
 			while (a + 1 <= pre_len)
 			{
 				InitBigNum(n2, 0, 64);
-				fixed (uint* pn2 = &n2[0])
-					Memcopy((byte*)pn2, pre, (int)a + 1);
-				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);

-				fixed (uint* pn3 = &n3[0])
-					Memcopy(buf, (byte*)pn3, (int)a);
+				Buffer.BlockCopy(src, srcOffset, n2, 0, a + 1);
+				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
+				Buffer.BlockCopy(n3, 0, dest, destOffset, a);

 				pre_len -= a + 1;
-				pre += a + 1;
-				buf += a;
+				srcOffset += a + 1;
+				destOffset += a;
 			}
+
+			return dest;
 		}

 		public byte[] DecryptKey(byte[] src)
 		{
 			InitPublicKey();
-			var dest = new byte[256];
-
-			unsafe
-			{
-				fixed (byte* pdest = &dest[0])
-				fixed (byte* psrc = &src[0])
-					ProcessPredata(psrc, LenPreData(), pdest);
-			}
-
-			return dest.Take(56).ToArray();
+			return ProcessPredata(src).Take(56).ToArray();
 		}
 	}
 }
--- a/OpenRA.Game/FileFormats/Format80.cs
+++ b/OpenRA.Game/FileFormats/Format80.cs
@@ -74,6 +74,9 @@ namespace OpenRA.FileFormats
 					var count = ((i & 0x70) >> 4) + 3;
 					var rpos = ((i & 0xf) << 8) + secondByte;

+					if (destIndex + count > dest.Length)
+						return destIndex;
+
 					ReplicatePrevious(dest, destIndex, destIndex - rpos, count);
 					destIndex += count;
 				}
--- a/OpenRA.Game/FileFormats/HvaReader.cs
+++ b/OpenRA.Game/FileFormats/HvaReader.cs
@@ -9,7 +9,10 @@

 #endregion

+using System;
 using System.IO;
+using System.Linq;
+using OpenRA.Graphics;

 namespace OpenRA.FileFormats
 {
@@ -19,7 +22,7 @@ namespace OpenRA.FileFormats
 		public readonly uint LimbCount;
 		public readonly float[] Transforms;

-		public HvaReader(Stream s)
+		public HvaReader(Stream s, string fileName)
 		{
 			// Index swaps for transposing a matrix
 			var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
@@ -31,6 +34,8 @@ namespace OpenRA.FileFormats
 			// Skip limb names
 			s.Seek(16 * LimbCount, SeekOrigin.Current);
 			Transforms = new float[16 * FrameCount * LimbCount];
+
+			var testMatrix = new float[16];
 			for (var j = 0; j < FrameCount; j++)
 				for (var i = 0; i < LimbCount; i++)
 				{
@@ -43,13 +48,19 @@ namespace OpenRA.FileFormats

 					for (var k = 0; k < 12; k++)
 						Transforms[c + ids[k]] = s.ReadFloat();
+
+					Array.Copy(Transforms, 16 * (LimbCount * j + i), testMatrix, 0, 16);
+					if (Util.MatrixInverse(testMatrix) == null)
+						throw new InvalidDataException(
+							"The transformation matrix for HVA file `{0}` section {1} frame {2} is invalid because it is not invertible!"
+							.F(fileName, i, j));
 				}
 		}

 		public static HvaReader Load(string filename)
 		{
 			using (var s = File.OpenRead(filename))
-				return new HvaReader(s);
+				return new HvaReader(s, Path.GetFileName(filename));
 		}
 	}
 }
--- a/OpenRA.Game/FileFormats/IniFile.cs
+++ b/OpenRA.Game/FileFormats/IniFile.cs
@@ -22,7 +22,8 @@ namespace OpenRA.FileFormats

 		public IniFile(Stream s)
 		{
-			Load(s);
+			using (s)
+				Load(s);
 		}

 		public IniFile(params Stream[] streams)
--- a/OpenRA.Game/FileFormats/PngLoader.cs
+++ b/OpenRA.Game/FileFormats/PngLoader.cs
@@ -84,6 +84,9 @@ namespace OpenRA.FileFormats

 							case "tRNS":
 								{
+									if (palette == null)
+										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
 									for (var i = 0; i < length; i++)
 										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
 								}
@@ -99,6 +102,9 @@ namespace OpenRA.FileFormats

 							case "IEND":
 								{
+									if (bitmap == null)
+										throw new InvalidDataException("Image header not found.");
+
 									var bits = bitmap.LockBits(bitmap.Bounds(),
 										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);

@@ -130,6 +136,9 @@ namespace OpenRA.FileFormats

 									bitmap.UnlockBits(bits);

+									if (palette == null)
+										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
 									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
 									{
 										var cp = temp.Palette;
--- a/OpenRA.Game/FileFormats/ReplayMetadata.cs
+++ b/OpenRA.Game/FileFormats/ReplayMetadata.cs
@@ -102,6 +102,10 @@ namespace OpenRA.FileFormats
 					{
 						return new ReplayMetadata(fs, path);
 					}
+					catch (YamlException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
 					catch (InvalidOperationException ex)
 					{
 						Log.Write("debug", ex.ToString());
--- a/OpenRA.Game/FileFormats/VqaReader.cs
+++ b/OpenRA.Game/FileFormats/VqaReader.cs
@@ -187,7 +187,9 @@ namespace OpenRA.FileFormats
 					{
 						case "SND0":
 						case "SND2":
-							if (audioChannels == 1)
+							if (audioChannels == 0)
+								throw new NotSupportedException();
+							else if (audioChannels == 1)
 							{
 								var rawAudio = stream.ReadBytes((int)length);
 								audio1.Write(rawAudio);
@@ -198,11 +200,15 @@ namespace OpenRA.FileFormats
 								audio1.Write(rawAudio);
 								rawAudio = stream.ReadBytes((int)length / 2);
 								audio2.Write(rawAudio);
+								if (length % 2 != 0)
+									stream.ReadBytes(2);
 							}

 							compressed = type == "SND2";
 							break;
 						default:
+							if (length + stream.Position > stream.Length)
+								throw new NotSupportedException("Vqa uses unknown Subtype: {0}".F(type));
 							stream.ReadBytes((int)length);
 							break;
 					}
--- a/OpenRA.Game/FileSystem/BagFile.cs
+++ b/OpenRA.Game/FileSystem/BagFile.cs
@@ -19,7 +19,7 @@ using OpenRA.Primitives;

 namespace OpenRA.FileSystem
 {
-	public sealed class BagFile : IFolder, IDisposable
+	public sealed class BagFile : IFolder
 	{
 		static readonly uint[] Nothing = { };

@@ -37,20 +37,16 @@ namespace OpenRA.FileSystem
 			// For example: audio.bag requires the audio.idx file
 			var indexFilename = Path.ChangeExtension(filename, ".idx");

-			s = GlobalFileSystem.Open(filename);
-
 			// Build the index and dispose the stream, it is no longer needed after this
 			List<IdxEntry> entries;
 			using (var indexStream = GlobalFileSystem.Open(indexFilename))
-			{
-				var reader = new IdxReader(indexStream);
-
-				entries = reader.Entries;
-			}
+				entries = new IdxReader(indexStream).Entries;

 			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
 				"{0} (bag format)".F(filename),
 				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+
+			s = GlobalFileSystem.Open(filename);
 		}

 		public int Priority { get { return 1000 + bagFilePriority; } }
@@ -185,8 +181,7 @@ namespace OpenRA.FileSystem

 		public void Dispose()
 		{
-			if (s != null)
-				s.Dispose();
+			s.Dispose();
 		}
 	}
 }
--- a/OpenRA.Game/FileSystem/BigFile.cs
+++ b/OpenRA.Game/FileSystem/BigFile.cs
@@ -15,37 +15,45 @@ using System.Linq;

 namespace OpenRA.FileSystem
 {
-	public class BigFile : IFolder
+	public sealed class BigFile : IFolder
 	{
 		public string Name { get; private set; }
 		public int Priority { get; private set; }
 		readonly Dictionary<string, Entry> entries = new Dictionary<string, Entry>();
+		readonly Stream s;

 		public BigFile(string filename, int priority)
 		{
 			Name = filename;
 			Priority = priority;

-			var s = GlobalFileSystem.Open(filename);
-
-			if (s.ReadASCII(4) != "BIGF")
-				throw new InvalidDataException("Header is not BIGF");
-
-			// Total archive size.
-			s.ReadUInt32();
-
-			var entryCount = s.ReadUInt32();
-			if (BitConverter.IsLittleEndian)
-				entryCount = int2.Swap(entryCount);
-
-			// First entry offset? This is apparently bogus for EA's .big files
-			// and we don't have to try seeking there since the entries typically start next in EA's .big files.
-			s.ReadUInt32();
-
-			for (var i = 0; i < entryCount; i++)
+			s = GlobalFileSystem.Open(filename);
+			try
 			{
-				var entry = new Entry(s);
-				entries.Add(entry.Path, entry);
+				if (s.ReadASCII(4) != "BIGF")
+					throw new InvalidDataException("Header is not BIGF");
+
+				// Total archive size.
+				s.ReadUInt32();
+
+				var entryCount = s.ReadUInt32();
+				if (BitConverter.IsLittleEndian)
+					entryCount = int2.Swap(entryCount);
+
+				// First entry offset? This is apparently bogus for EA's .big files
+				// and we don't have to try seeking there since the entries typically start next in EA's .big files.
+				s.ReadUInt32();
+
+				for (var i = 0; i < entryCount; i++)
+				{
+					var entry = new Entry(s);
+					entries.Add(entry.Path, entry);
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}

@@ -107,5 +115,10 @@ namespace OpenRA.FileSystem
 		{
 			throw new NotImplementedException();
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }
--- a/OpenRA.Game/FileSystem/D2kSoundResources.cs
+++ b/OpenRA.Game/FileSystem/D2kSoundResources.cs
@@ -14,7 +14,7 @@ using System.IO;

 namespace OpenRA.FileSystem
 {
-	public class D2kSoundResources : IFolder
+	public sealed class D2kSoundResources : IFolder
 	{
 		readonly Stream s;

@@ -30,22 +30,28 @@ namespace OpenRA.FileSystem
 			this.priority = priority;

 			s = GlobalFileSystem.Open(filename);
-			s.Seek(0, SeekOrigin.Begin);
-
-			filenames = new List<string>();
-
-			var headerLength = s.ReadUInt32();
-			while (s.Position < headerLength + 4)
+			try
 			{
-				var name = s.ReadASCIIZ();
-				var offset = s.ReadUInt32();
-				var length = s.ReadUInt32();
+				filenames = new List<string>();

-				var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
-				if (!index.ContainsKey(hash))
-					index.Add(hash, new PackageEntry(hash, offset, length));
+				var headerLength = s.ReadUInt32();
+				while (s.Position < headerLength + 4)
+				{
+					var name = s.ReadASCIIZ();
+					var offset = s.ReadUInt32();
+					var length = s.ReadUInt32();

-				filenames.Add(name);
+					var hash = PackageEntry.HashFilename(name, PackageHashType.Classic);
+					if (!index.ContainsKey(hash))
+						index.Add(hash, new PackageEntry(hash, offset, length));
+
+					filenames.Add(name);
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}

@@ -92,5 +98,10 @@ namespace OpenRA.FileSystem
 		{
 			throw new NotImplementedException("Cannot save Dune 2000 Sound Resources.");
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }
--- a/OpenRA.Game/FileSystem/Folder.cs
+++ b/OpenRA.Game/FileSystem/Folder.cs
@@ -13,7 +13,7 @@ using System.IO;

 namespace OpenRA.FileSystem
 {
-	public class Folder : IFolder
+	public sealed class Folder : IFolder
 	{
 		readonly string path;
 		readonly int priority;
@@ -78,5 +78,7 @@ namespace OpenRA.FileSystem
 				using (var writer = new BinaryWriter(dataStream))
 					writer.Write(file.Value);
 		}
+
+		public void Dispose() { }
 	}
 }
--- a/OpenRA.Game/FileSystem/GlobalFileSystem.cs
+++ b/OpenRA.Game/FileSystem/GlobalFileSystem.cs
@@ -17,7 +17,7 @@ using OpenRA.Primitives;

 namespace OpenRA.FileSystem
 {
-	public interface IFolder
+	public interface IFolder : IDisposable
 	{
 		Stream GetContent(string filename);
 		bool Exists(string filename);
@@ -74,6 +74,8 @@ namespace OpenRA.FileSystem
 				throw new NotImplementedException("The creation of .PAK archives is unimplemented");
 			if (filename.EndsWith(".big", StringComparison.InvariantCultureIgnoreCase))
 				throw new NotImplementedException("The creation of .big archives is unimplemented");
+			if (filename.EndsWith(".cab", StringComparison.InvariantCultureIgnoreCase))
+				throw new NotImplementedException("The creation of .cab archives is unimplemented");

 			return new Folder(filename, order, content);
 		}
@@ -103,6 +105,8 @@ namespace OpenRA.FileSystem
 				return new BigFile(filename, order);
 			if (filename.EndsWith(".bag", StringComparison.InvariantCultureIgnoreCase))
 				return new BagFile(filename, order);
+			if (filename.EndsWith(".hdr", StringComparison.InvariantCultureIgnoreCase))
+				return new InstallShieldCABExtractor(filename, order);

 			return new Folder(filename, order);
 		}
@@ -127,6 +131,9 @@ namespace OpenRA.FileSystem

 		public static void UnmountAll()
 		{
+			foreach (var folder in MountedFolders)
+				folder.Dispose();
+
 			MountedFolders.Clear();
 			FolderPaths.Clear();
 			classicHashIndex = new Cache<uint, List<IFolder>>(_ => new List<IFolder>());
@@ -135,6 +142,9 @@ namespace OpenRA.FileSystem

 		public static bool Unmount(IFolder mount)
 		{
+			if (MountedFolders.Contains(mount))
+				mount.Dispose();
+
 			return MountedFolders.RemoveAll(f => f == mount) > 0;
 		}

@@ -175,10 +185,23 @@ namespace OpenRA.FileSystem
 			return s;
 		}

-		public static bool TryOpen(string filename, out Stream s)
+		public static bool TryOpen(string name, out Stream s)
 		{
-			// Check the cache for a quick lookup
-			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1)
+			var filename = name;
+			var foldername = string.Empty;
+
+			// Used for faction specific packages; rule out false positive on Windows C:\ drive notation
+			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
+			if (explicitFolder)
+			{
+				var divide = name.Split(':');
+				foldername = divide.First();
+				filename = divide.Last();
+			}
+
+			// Check the cache for a quick lookup if the folder name is unknown
+			// TODO: This disables caching for explicit folder requests
+			if (filename.IndexOfAny(new char[] { '/', '\\' }) == -1 && !explicitFolder)
 			{
 				s = GetFromCache(PackageHashType.Classic, filename);
 				if (s != null)
@@ -190,9 +213,11 @@ namespace OpenRA.FileSystem
 			}

 			// Ask each package individually
-			var folder = MountedFolders
-				.Where(x => x.Exists(filename))
-				.MaxByOrDefault(x => x.Priority);
+			IFolder folder;
+			if (explicitFolder && !string.IsNullOrEmpty(foldername))
+				folder = MountedFolders.Where(x => x.Name == foldername).MaxByOrDefault(x => x.Priority);
+			else
+				folder = MountedFolders.Where(x => x.Exists(filename)).MaxByOrDefault(x => x.Priority);

 			if (folder != null)
 			{
@@ -204,7 +229,19 @@ namespace OpenRA.FileSystem
 			return false;
 		}

-		public static bool Exists(string filename) { return MountedFolders.Any(f => f.Exists(filename)); }
+		public static bool Exists(string name)
+		{
+			var explicitFolder = name.Contains(':') && !Directory.Exists(Path.GetDirectoryName(name));
+			if (explicitFolder)
+			{
+				var divide = name.Split(':');
+				var foldername = divide.First();
+				var filename = divide.Last();
+				return MountedFolders.Where(n => n.Name == foldername).Any(f => f.Exists(filename));
+			}
+			else
+				return MountedFolders.Any(f => f.Exists(name));
+		}

 		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();

--- a/OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs
+++ b/OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs
@@ -0,0 +1,527 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using ICSharpCode.SharpZipLib.Zip.Compression;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+
+namespace OpenRA.FileSystem
+{
+	public class InstallShieldCABExtractor : IDisposable, IFolder
+	{
+		const uint FileSplit = 0x1;
+		const uint FileObfuscated = 0x2;
+		const uint FileCompressed = 0x4;
+		const uint FileInvalid = 0x8;
+
+		const uint LinkPrev = 0x1;
+		const uint LinkNext = 0x2;
+		const uint MaxFileGroupCount = 71;
+
+#region Nested Structs
+
+		struct FileGroup
+		{
+			public readonly string Name;
+			public readonly uint FirstFile;
+			public readonly uint LastFile;
+
+			public FileGroup(Stream reader, long offset)
+			{
+				var nameOffset = reader.ReadUInt32();
+				/*   unknown  */ reader.ReadBytes(18);
+				FirstFile = reader.ReadUInt32();
+				LastFile = reader.ReadUInt32();
+
+				reader.Seek(offset + (long)nameOffset, SeekOrigin.Begin);
+				Name = reader.ReadASCIIZ();
+			}
+		}
+
+		struct VolumeHeader
+		{
+			public readonly uint DataOffset;
+			public readonly uint DataOffsetHigh;
+			public readonly uint FirstFileIndex;
+			public readonly uint LastFileIndex;
+
+			public readonly uint FirstFileOffset;
+			public readonly uint FirstFileOffsetHigh;
+			public readonly uint FirstFileSizeExpanded;
+			public readonly uint FirstFileSizeExpandedHigh;
+
+			public readonly uint FirstFileSizeCompressed;
+			public readonly uint FirstFileSizeCompressedHigh;
+			public readonly uint LastFileOffset;
+			public readonly uint LastFileOffsetHigh;
+
+			public readonly uint LastFileSizeExpanded;
+			public readonly uint LastFileSizeExpandedHigh;
+			public readonly uint LastFileSizeCompressed;
+			public readonly uint LastFileSizeCompressedHigh;
+
+			public VolumeHeader(Stream reader)
+			{
+				DataOffset = reader.ReadUInt32();
+				DataOffsetHigh = reader.ReadUInt32();
+
+				FirstFileIndex = reader.ReadUInt32();
+				LastFileIndex = reader.ReadUInt32();
+				FirstFileOffset = reader.ReadUInt32();
+				FirstFileOffsetHigh = reader.ReadUInt32();
+
+				FirstFileSizeExpanded = reader.ReadUInt32();
+				FirstFileSizeExpandedHigh = reader.ReadUInt32();
+				FirstFileSizeCompressed = reader.ReadUInt32();
+				FirstFileSizeCompressedHigh = reader.ReadUInt32();
+
+				LastFileOffset = reader.ReadUInt32();
+				LastFileOffsetHigh = reader.ReadUInt32();
+				LastFileSizeExpanded = reader.ReadUInt32();
+				LastFileSizeExpandedHigh = reader.ReadUInt32();
+
+				LastFileSizeCompressed = reader.ReadUInt32();
+				LastFileSizeCompressedHigh = reader.ReadUInt32();
+			}
+		}
+
+		struct CommonHeader
+		{
+			public const long Size = 16;
+			public readonly uint Version;
+			public readonly uint VolumeInfo;
+			public readonly long CabDescriptorOffset;
+			public readonly uint CabDescriptorSize;
+
+			public CommonHeader(Stream reader)
+			{
+				Version = reader.ReadUInt32();
+				VolumeInfo = reader.ReadUInt32();
+				CabDescriptorOffset = (long)reader.ReadUInt32();
+				CabDescriptorSize = reader.ReadUInt32();
+			}
+		}
+
+		struct CabDescriptor
+		{
+			public readonly long FileTableOffset;
+			public readonly uint FileTableSize;
+			public readonly uint FileTableSize2;
+			public readonly uint DirectoryCount;
+
+			public readonly uint FileCount;
+			public readonly long FileTableOffset2;
+
+			public CabDescriptor(Stream reader, CommonHeader commonHeader)
+			{
+				reader.Seek(commonHeader.CabDescriptorOffset + 12, SeekOrigin.Begin);
+				FileTableOffset = (long)reader.ReadUInt32();
+				/*    unknown  */ reader.ReadUInt32();
+				FileTableSize = reader.ReadUInt32();
+
+				FileTableSize2 = reader.ReadUInt32();
+				DirectoryCount = reader.ReadUInt32();
+				/*   unknown  */ reader.ReadBytes(8);
+				FileCount = reader.ReadUInt32();
+
+				FileTableOffset2 = (long)reader.ReadUInt32();
+			}
+		}
+
+		struct FileDescriptor
+		{
+			public readonly ushort	Flags;
+			public readonly uint	ExpandedSize;
+			public readonly uint	CompressedSize;
+			public readonly uint	DataOffset;
+
+			public readonly byte[]	MD5;
+			public readonly uint	NameOffset;
+			public readonly ushort	DirectoryIndex;
+			public readonly uint	LinkToPrevious;
+
+			public readonly uint	LinkToNext;
+			public readonly byte	LinkFlags;
+			public readonly ushort	Volume;
+			public readonly string	Filename;
+
+			public FileDescriptor(Stream reader, long tableOffset)
+			{
+				Flags = reader.ReadUInt16();
+				ExpandedSize = reader.ReadUInt32();
+				/*    unknown   */ reader.ReadUInt32();
+				CompressedSize = reader.ReadUInt32();
+
+				/*  unknown */ reader.ReadUInt32();
+				DataOffset   = reader.ReadUInt32();
+				/*  unknown */ reader.ReadUInt32();
+				MD5          = reader.ReadBytes(16);
+
+				/*   unknown  */ reader.ReadBytes(16);
+				NameOffset     = reader.ReadUInt32();
+				DirectoryIndex = reader.ReadUInt16();
+				/*   unknown  */ reader.ReadBytes(12);
+				LinkToPrevious = reader.ReadUInt32();
+				LinkToNext = reader.ReadUInt32();
+
+				LinkFlags = reader.ReadBytes(1)[0];
+				Volume = reader.ReadUInt16();
+				var posSave = reader.Position;
+
+				reader.Seek(tableOffset + NameOffset, SeekOrigin.Begin);
+				Filename = reader.ReadASCIIZ();
+				reader.Seek(posSave, SeekOrigin.Begin);
+			}
+		}
+
+		class CabReader : IDisposable
+		{
+			readonly FileDescriptor fileDes;
+			public uint RemainingArchiveStream;
+			public uint RemainingFileStream;
+			readonly uint index;
+			readonly string commonName;
+			ushort volumeNumber;
+			Stream cabFile;
+
+			public CabReader(FileDescriptor fileDes, uint index, string commonName)
+			{
+				this.fileDes = fileDes;
+				this.index = index;
+				this.commonName = commonName;
+				volumeNumber = (ushort)((uint)fileDes.Volume - 1u);
+				RemainingArchiveStream = 0;
+				if ((fileDes.Flags & FileCompressed) > 0)
+					RemainingFileStream = fileDes.CompressedSize;
+				else
+					RemainingFileStream = fileDes.ExpandedSize;
+
+				cabFile = null;
+				NextFile();
+			}
+
+			public void CopyTo(Stream dest)
+			{
+				if ((fileDes.Flags & FileCompressed) != 0)
+				{
+					var inf = new Inflater(true);
+					var buffer = new byte[165535];
+					do
+					{
+						var bytesToExtract = cabFile.ReadUInt16();
+						RemainingArchiveStream -= 2u;
+						RemainingFileStream -= 2u;
+						inf.SetInput(GetBytes(bytesToExtract));
+						RemainingFileStream -= bytesToExtract;
+						while (!inf.IsNeedingInput)
+						{
+							var inflated = inf.Inflate(buffer);
+							dest.Write(buffer, 0, inflated);
+						}
+
+						inf.Reset();
+					}
+					while (RemainingFileStream > 0);
+				}
+				else
+				{
+					do
+					{
+						RemainingFileStream -= RemainingArchiveStream;
+						dest.Write(GetBytes(RemainingArchiveStream), 0, (int)RemainingArchiveStream);
+					}
+					while (RemainingFileStream > 0);
+				}
+			}
+
+			public byte[] GetBytes(uint count)
+			{
+				if (count < RemainingArchiveStream)
+				{
+					RemainingArchiveStream -= count;
+					return cabFile.ReadBytes((int)count);
+				}
+				else
+				{
+					var outArray = new byte[count];
+					var read = cabFile.Read(outArray, 0, (int)RemainingArchiveStream);
+					if (RemainingFileStream > RemainingArchiveStream)
+					{
+						NextFile();
+						RemainingArchiveStream -= (uint)cabFile.Read(outArray, read, (int)count - read);
+					}
+
+					return outArray;
+				}
+			}
+
+			public void Dispose()
+			{
+				cabFile.Dispose();
+			}
+
+			public void NextFile()
+			{
+				if (cabFile != null)
+					cabFile.Dispose();
+
+				++volumeNumber;
+				cabFile = GlobalFileSystem.Open("{0}{1}.cab".F(commonName, volumeNumber));
+				if (cabFile.ReadUInt32() != 0x28635349)
+					throw new InvalidDataException("Not an Installshield CAB package");
+
+				uint fileOffset;
+				if ((fileDes.Flags & FileSplit) != 0)
+				{
+					cabFile.Seek(CommonHeader.Size, SeekOrigin.Current);
+					var head = new VolumeHeader(cabFile);
+					if (index == head.LastFileIndex)
+					{
+						if ((fileDes.Flags & FileCompressed) != 0)
+							RemainingArchiveStream = head.LastFileSizeCompressed;
+						else
+							RemainingArchiveStream = head.LastFileSizeExpanded;
+
+						fileOffset = head.LastFileOffset;
+					}
+					else if (index == head.FirstFileIndex)
+					{
+						if ((fileDes.Flags & FileCompressed) != 0)
+							RemainingArchiveStream = head.FirstFileSizeCompressed;
+						else
+							RemainingArchiveStream = head.FirstFileSizeExpanded;
+
+						fileOffset = head.FirstFileOffset;
+					}
+					else
+						throw new Exception("Cannot Resolve Remaining Stream");
+				}
+				else
+				{
+					if ((fileDes.Flags & FileCompressed) != 0)
+						RemainingArchiveStream = fileDes.CompressedSize;
+					else
+						RemainingArchiveStream = fileDes.ExpandedSize;
+
+					fileOffset = fileDes.DataOffset;
+				}
+
+				cabFile.Seek(fileOffset, SeekOrigin.Begin);
+			}
+		}
+#endregion
+
+		readonly Stream hdrFile;
+		readonly CommonHeader commonHeader;
+		readonly CabDescriptor cabDescriptor;
+		readonly List<uint> directoryTable;
+		readonly Dictionary<uint, string> directoryNames = new Dictionary<uint, string>();
+		readonly Dictionary<uint, FileDescriptor> fileDescriptors = new Dictionary<uint, FileDescriptor>();
+		readonly Dictionary<string, uint> fileLookup = new Dictionary<string, uint>();
+		int priority;
+		string commonName;
+		public int Priority { get { return priority; } }
+
+		public string Name { get { return commonName; } }
+
+		public InstallShieldCABExtractor(string hdrFilename, int priority = -1)
+		{
+			var fileGroups = new List<FileGroup>();
+			var fileGroupOffsets = new List<uint>();
+
+			this.priority = priority;
+			hdrFile = GlobalFileSystem.Open(hdrFilename);
+
+			// Strips archive number AND file extension
+			commonName = Regex.Replace(hdrFilename, @"\d*\.[^\.]*$", "");
+			var signature = hdrFile.ReadUInt32();
+
+			if (signature != 0x28635349)
+				throw new InvalidDataException("Not an Installshield CAB package");
+
+			commonHeader = new CommonHeader(hdrFile);
+			cabDescriptor = new CabDescriptor(hdrFile, commonHeader);
+			/*    unknown   */ hdrFile.ReadBytes(14);
+
+			for (var i = 0U; i < MaxFileGroupCount; ++i)
+				fileGroupOffsets.Add(hdrFile.ReadUInt32());
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset, SeekOrigin.Begin);
+			directoryTable = new List<uint>();
+
+			for (var i = 0U; i < cabDescriptor.DirectoryCount; ++i)
+				directoryTable.Add(hdrFile.ReadUInt32());
+
+			foreach (var offset in fileGroupOffsets)
+			{
+				var nextOffset = offset;
+				while (nextOffset != 0)
+				{
+					hdrFile.Seek((long)nextOffset + 4 + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
+					var descriptorOffset = hdrFile.ReadUInt32();
+					nextOffset = hdrFile.ReadUInt32();
+					hdrFile.Seek((long)descriptorOffset + commonHeader.CabDescriptorOffset, SeekOrigin.Begin);
+
+					fileGroups.Add(new FileGroup(hdrFile, commonHeader.CabDescriptorOffset));
+				}
+			}
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset + cabDescriptor.FileTableOffset2, SeekOrigin.Begin);
+			foreach (var fileGroup in fileGroups)
+			{
+				for (var index = fileGroup.FirstFile; index <= fileGroup.LastFile; ++index)
+				{
+					AddFileDescriptorToList(index);
+					var fileDescriptor = fileDescriptors[index];
+					var fullFilePath   = "{0}\\{1}\\{2}".F(fileGroup.Name, DirectoryName((uint)fileDescriptor.DirectoryIndex), fileDescriptor.Filename);
+					fileLookup.Add(fullFilePath, index);
+				}
+			}
+		}
+
+		public string DirectoryName(uint index)
+		{
+			if (directoryNames.ContainsKey(index))
+				return directoryNames[index];
+
+			hdrFile.Seek(commonHeader.CabDescriptorOffset +
+					cabDescriptor.FileTableOffset +
+					directoryTable[(int)index],
+					SeekOrigin.Begin);
+
+			var test = hdrFile.ReadASCIIZ();
+			return test;
+		}
+
+		public bool Exists(string filename)
+		{
+			return fileLookup.ContainsKey(filename);
+		}
+
+		public uint DirectoryCount()
+		{
+			return cabDescriptor.DirectoryCount;
+		}
+
+		public string FileName(uint index)
+		{
+			if (!fileDescriptors.ContainsKey(index))
+				AddFileDescriptorToList(index);
+
+			return fileDescriptors[index].Filename;
+		}
+
+		void AddFileDescriptorToList(uint index)
+		{
+			hdrFile.Seek(commonHeader.CabDescriptorOffset +
+					cabDescriptor.FileTableOffset +
+					cabDescriptor.FileTableOffset2 +
+					index * 0x57,
+					SeekOrigin.Begin);
+
+			var fd = new FileDescriptor(hdrFile,
+				commonHeader.CabDescriptorOffset + cabDescriptor.FileTableOffset);
+
+			fileDescriptors.Add(index, fd);
+		}
+
+		public uint FileCount()
+		{
+			return cabDescriptor.FileCount;
+		}
+
+		public void ExtractFile(uint index, string fileName)
+		{
+			Directory.CreateDirectory(Path.GetDirectoryName(fileName));
+			using (var destfile = File.Open(fileName, FileMode.Create))
+				GetContentById(index, destfile);
+		}
+
+		public void Write(Dictionary<string, byte[]> input)
+		{
+			throw new NotImplementedException("Cannot Add Files To Cab");
+		}
+
+		public IEnumerable<uint> ClassicHashes()
+		{
+			return fileLookup.Keys.Select(k => PackageEntry.HashFilename(k, PackageHashType.Classic));
+		}
+
+		public Stream GetContentById(uint index)
+		{
+			var fileDes = fileDescriptors[index];
+			if ((fileDes.Flags & FileInvalid) != 0)
+				throw new Exception("File Invalid");
+
+			if ((fileDes.LinkFlags & LinkPrev) != 0)
+				return GetContentById(fileDes.LinkToPrevious);
+
+			if ((fileDes.Flags & FileObfuscated) != 0)
+				throw new NotImplementedException("Haven't implemented obfustcated files");
+
+			var output = new MemoryStream((int)fileDes.ExpandedSize);
+
+			using (var reader = new CabReader(fileDes, index, commonName))
+				reader.CopyTo(output);
+
+			if (output.Length != fileDes.ExpandedSize)
+				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
+
+			output.Position = 0;
+			return output;
+		}
+
+		public void GetContentById(uint index, Stream output)
+		{
+			var fileDes = fileDescriptors[index];
+			if ((fileDes.Flags & FileInvalid) != 0)
+				throw new Exception("File Invalid");
+
+			if ((fileDes.LinkFlags & LinkPrev) != 0)
+			{
+				GetContentById(fileDes.LinkToPrevious, output);
+				return;
+			}
+
+			if ((fileDes.Flags & FileObfuscated) != 0)
+				throw new NotImplementedException("Haven't implemented obfustcated files");
+
+			using (var reader = new CabReader(fileDes, index, commonName))
+				reader.CopyTo(output);
+
+			if (output.Length != fileDes.ExpandedSize)
+				throw new Exception("Did not fully extract Expected = {0}, Got = {1}".F(fileDes.ExpandedSize, output.Length));
+		}
+
+		public Stream GetContent(string fileName)
+		{
+			return GetContentById(fileLookup[fileName]);
+		}
+
+		public IEnumerable<uint> CrcHashes()
+		{
+			yield break;
+		}
+
+		public IEnumerable<string> AllFileNames()
+		{
+			return fileLookup.Keys;
+		}
+
+		public void Dispose()
+		{
+			hdrFile.Dispose();
+		}
+	}
+}
--- a/OpenRA.Game/FileSystem/InstallShieldPackage.cs
+++ b/OpenRA.Game/FileSystem/InstallShieldPackage.cs
@@ -15,7 +15,7 @@ using OpenRA.FileFormats;

 namespace OpenRA.FileSystem
 {
-	public class InstallShieldPackage : IFolder
+	public sealed class InstallShieldPackage : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
 		readonly List<string> filenames;
@@ -28,38 +28,47 @@ namespace OpenRA.FileSystem
 		{
 			this.filename = filename;
 			this.priority = priority;
+
 			filenames = new List<string>();
+
 			s = GlobalFileSystem.Open(filename);
+			try
+			{
+				// Parse package header
+				var reader = new BinaryReader(s);
+				var signature = reader.ReadUInt32();
+				if (signature != 0x8C655D13)
+					throw new InvalidDataException("Not an Installshield package");

-			// Parse package header
-			var reader = new BinaryReader(s);
-			var signature = reader.ReadUInt32();
-			if (signature != 0x8C655D13)
-				throw new InvalidDataException("Not an Installshield package");
+				reader.ReadBytes(8);
+				/*var FileCount = */reader.ReadUInt16();
+				reader.ReadBytes(4);
+				/*var ArchiveSize = */reader.ReadUInt32();
+				reader.ReadBytes(19);
+				var tocAddress = reader.ReadInt32();
+				reader.ReadBytes(4);
+				var dirCount = reader.ReadUInt16();

-			reader.ReadBytes(8);
-			/*var FileCount = */reader.ReadUInt16();
-			reader.ReadBytes(4);
-			/*var ArchiveSize = */reader.ReadUInt32();
-			reader.ReadBytes(19);
-			var tocAddress = reader.ReadInt32();
-			reader.ReadBytes(4);
-			var dirCount = reader.ReadUInt16();
+				// Parse the directory list
+				s.Seek(tocAddress, SeekOrigin.Begin);
+				var tocReader = new BinaryReader(s);

-			// Parse the directory list
-			s.Seek(tocAddress, SeekOrigin.Begin);
-			var tocReader = new BinaryReader(s);
+				var fileCountInDirs = new List<uint>();

-			var fileCountInDirs = new List<uint>();
+				// Parse directories
+				for (var i = 0; i < dirCount; i++)
+					fileCountInDirs.Add(ParseDirectory(tocReader));

-			// Parse directories
-			for (var i = 0; i < dirCount; i++)
-				fileCountInDirs.Add(ParseDirectory(tocReader));
-
-			// Parse files
-			foreach (var fileCount in fileCountInDirs)
-				for (var i = 0; i < fileCount; i++)
-					ParseFile(reader);
+				// Parse files
+				foreach (var fileCount in fileCountInDirs)
+					for (var i = 0; i < fileCount; i++)
+						ParseFile(reader);
+			}
+			catch
+			{
+				Dispose();
+				throw;
+			}
 		}

 		static uint ParseDirectory(BinaryReader reader)
@@ -140,5 +149,10 @@ namespace OpenRA.FileSystem
 		{
 			throw new NotImplementedException("Cannot save InstallShieldPackages.");
 		}
+
+		public void Dispose()
+		{
+			s.Dispose();
+		}
 	}
 }
--- a/OpenRA.Game/FileSystem/MixFile.cs
+++ b/OpenRA.Game/FileSystem/MixFile.cs
@@ -17,7 +17,7 @@ using OpenRA.FileFormats;

 namespace OpenRA.FileSystem
 {
-	public sealed class MixFile : IFolder, IDisposable
+	public sealed class MixFile : IFolder
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly long dataStart;
@@ -37,9 +37,17 @@ namespace OpenRA.FileSystem
 				File.Delete(filename);

 			s = File.Create(filename);
-			index = new Dictionary<uint, PackageEntry>();
-			contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
-			Write(contents);
+			try
+			{
+				index = new Dictionary<uint, PackageEntry>();
+				contents.Add("local mix database.dat", new XccLocalDatabase(contents.Keys.Append("local mix database.dat")).Data());
+				Write(contents);
+			}
+			catch
+			{
+				Dispose();
+				throw;
+			}
 		}

 		public MixFile(string filename, PackageHashType type, int priority)
@@ -47,29 +55,36 @@ namespace OpenRA.FileSystem
 			this.filename = filename;
 			this.priority = priority;
 			this.type = type;
+
 			s = GlobalFileSystem.Open(filename);
-
-			// Detect format type
-			s.Seek(0, SeekOrigin.Begin);
-			var isCncMix = s.ReadUInt16() != 0;
-
-			// The C&C mix format doesn't contain any flags or encryption
-			var isEncrypted = false;
-			if (!isCncMix)
-				isEncrypted = (s.ReadUInt16() & 0x2) != 0;
-
-			List<PackageEntry> entries;
-			if (isEncrypted)
+			try
 			{
-				long unused;
-				entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
-			}
-			else
-				entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
+				// Detect format type
+				var isCncMix = s.ReadUInt16() != 0;

-			index = entries.ToDictionaryWithConflictLog(x => x.Hash,
-				"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
-				null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+				// The C&C mix format doesn't contain any flags or encryption
+				var isEncrypted = false;
+				if (!isCncMix)
+					isEncrypted = (s.ReadUInt16() & 0x2) != 0;
+
+				List<PackageEntry> entries;
+				if (isEncrypted)
+				{
+					long unused;
+					entries = ParseHeader(DecryptHeader(s, 4, out dataStart), 0, out unused);
+				}
+				else
+					entries = ParseHeader(s, isCncMix ? 0 : 4, out dataStart);
+
+				index = entries.ToDictionaryWithConflictLog(x => x.Hash,
+					"{0} ({1} format, Encrypted: {2}, DataStart: {3})".F(filename, isCncMix ? "C&C" : "RA/TS/RA2", isEncrypted, dataStart),
+					null, x => "(offs={0}, len={1})".F(x.Offset, x.Length));
+			}
+			catch (Exception)
+			{
+				Dispose();
+				throw;
+			}
 		}

 		static List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
@@ -122,6 +137,15 @@ namespace OpenRA.FileSystem

 		static uint[] ReadBlocks(Stream s, long offset, int count)
 		{
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException("offset", "Non-negative number required.");
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException("count", "Non-negative number required.");
+
+			if (offset + (count * 2) > s.Length)
+				throw new ArgumentException("Bytes to read {0} and offset {1} greater than stream length {2}.".F(count * 2, offset, s.Length));
+
 			s.Seek(offset, SeekOrigin.Begin);

 			// A block is a single encryption unit (represented as two 32-bit integers)
@@ -260,8 +284,7 @@ namespace OpenRA.FileSystem

 		public void Dispose()
 		{
-			if (s != null)
-				s.Dispose();
+			s.Dispose();
 		}
 	}
 }
--- a/OpenRA.Game/FileSystem/PackageEntry.cs
+++ b/OpenRA.Game/FileSystem/PackageEntry.cs
@@ -65,16 +65,16 @@ namespace OpenRA.FileSystem
 						if (name.Length % 4 != 0)
 							name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');

-						var ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
-						var reader = new BinaryReader(ms);
+						using (var ms = new MemoryStream(Encoding.ASCII.GetBytes(name)))
+						{
+							var len = name.Length >> 2;
+							uint result = 0;

-						var len = name.Length >> 2;
-						uint result = 0;
+							while (len-- != 0)
+								result = ((result << 1) | (result >> 31)) + ms.ReadUInt32();

-						while (len-- != 0)
-							result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
-
-						return result;
+							return result;
+						}
 					}

 				case PackageHashType.CRC32:
--- a/OpenRA.Game/FileSystem/Pak.cs
+++ b/OpenRA.Game/FileSystem/Pak.cs
@@ -21,34 +21,42 @@ namespace OpenRA.FileSystem
 		public string Filename;
 	}

-	public class PakFile : IFolder
+	public sealed class PakFile : IFolder
 	{
-		string filename;
-		int priority;
-		Dictionary<string, Entry> index;
-		Stream stream;
+		readonly string filename;
+		readonly int priority;
+		readonly Dictionary<string, Entry> index;
+		readonly Stream stream;

 		public PakFile(string filename, int priority)
 		{
 			this.filename = filename;
 			this.priority = priority;
 			index = new Dictionary<string, Entry>();
+
 			stream = GlobalFileSystem.Open(filename);
-
-			index = new Dictionary<string, Entry>();
-			var offset = stream.ReadUInt32();
-			while (offset != 0)
+			try
 			{
-				var file = stream.ReadASCIIZ();
-				var next = stream.ReadUInt32();
-				var length = (next == 0 ? (uint)stream.Length : next) - offset;
+				index = new Dictionary<string, Entry>();
+				var offset = stream.ReadUInt32();
+				while (offset != 0)
+				{
+					var file = stream.ReadASCIIZ();
+					var next = stream.ReadUInt32();
+					var length = (next == 0 ? (uint)stream.Length : next) - offset;

-				// Ignore duplicate files
-				if (index.ContainsKey(file))
-					continue;
+					// Ignore duplicate files
+					if (index.ContainsKey(file))
+						continue;

-				index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
-				offset = next;
+					index.Add(file, new Entry { Offset = offset, Length = length, Filename = file });
+					offset = next;
+				}
+			}
+			catch
+			{
+				Dispose();
+				throw;
 			}
 		}

@@ -92,5 +100,10 @@ namespace OpenRA.FileSystem

 		public int Priority { get { return 1000 + priority; } }
 		public string Name { get { return filename; } }
+
+		public void Dispose()
+		{
+			stream.Dispose();
+		}
 	}
 }
--- a/OpenRA.Game/FileSystem/ZipFile.cs
+++ b/OpenRA.Game/FileSystem/ZipFile.cs
@@ -17,11 +17,11 @@ using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;

 namespace OpenRA.FileSystem
 {
-	public sealed class ZipFile : IFolder, IDisposable
+	public sealed class ZipFile : IFolder
 	{
-		string filename;
+		readonly string filename;
+		readonly int priority;
 		SZipFile pkg;
-		int priority;

 		static ZipFile()
 		{
@@ -58,7 +58,11 @@ namespace OpenRA.FileSystem

 		public Stream GetContent(string filename)
 		{
-			using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
+			var entry = pkg.GetEntry(filename);
+			if (entry == null)
+				return null;
+
+			using (var z = pkg.GetInputStream(entry))
 			{
 				var ms = new MemoryStream();
 				z.CopyTo(ms);
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -11,11 +11,12 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
-using MaxMind.GeoIP2;
+using OpenRA.Chat;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
@@ -42,22 +43,23 @@ namespace OpenRA
 		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced

 		public static Renderer Renderer;
+		public static Sound Sound;
 		public static bool HasInputFocus = false;

-		public static DatabaseReader GeoIpDatabase;
+		public static GlobalChat GlobalChat;

 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
 			IConnection connection = new NetworkConnection(host, port);
 			if (recordReplay)
-				connection = new ReplayRecorderConnection(connection, ChooseReplayFilename);
+				connection = new ReplayRecorderConnection(connection, TimestampedFilename);

 			var om = new OrderManager(host, port, password, connection);
 			JoinInner(om);
 			return om;
 		}

-		static string ChooseReplayFilename()
+		static string TimestampedFilename()
 		{
 			return DateTime.UtcNow.ToString("OpenRA-yyyy-MM-ddTHHmmssZ");
 		}
@@ -137,6 +139,10 @@ namespace OpenRA
 		public static event Action BeforeGameStart = () => { };
 		internal static void StartGame(string mapUID, WorldType type)
 		{
+			// Dispose of the old world before creating a new one.
+			if (worldRenderer != null)
+				worldRenderer.Dispose();
+
 			Cursor.SetCursor(null);
 			BeforeGameStart();

@@ -145,13 +151,7 @@ namespace OpenRA
 			using (new PerfTimer("PrepareMap"))
 				map = ModData.PrepareMap(mapUID);
 			using (new PerfTimer("NewWorld"))
-			{
 				OrderManager.World = new World(map, OrderManager, type);
-				OrderManager.World.Timestep = Timestep;
-			}
-
-			if (worldRenderer != null)
-				worldRenderer.Dispose();

 			worldRenderer = new WorldRenderer(OrderManager.World);

@@ -207,6 +207,7 @@ namespace OpenRA
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
+			Log.AddChannel("irc", "irc.log");

 			if (Settings.Server.DiscoverNatDevices)
 				UPnP.TryNatDiscovery();
@@ -216,17 +217,10 @@ namespace OpenRA
 				Settings.Server.AllowPortForward = false;
 			}

-			try
-			{
-				GeoIpDatabase = new DatabaseReader("GeoLite2-Country.mmdb");
-			}
-			catch (Exception e)
-			{
-				Log.Write("geoip", "DatabaseReader failed: {0}", e);
-			}
+			GeoIP.Initialize();

 			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
-			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
+			var renderers = new[] { Settings.Graphics.Renderer, "Default", null };
 			foreach (var r in renderers)
 			{
 				if (r == null)
@@ -245,17 +239,9 @@ namespace OpenRA
 				}
 			}

-			try
-			{
-				Sound.Create(Settings.Sound.Engine);
-			}
-			catch (Exception e)
-			{
-				Log.Write("sound", "{0}", e);
-				Console.WriteLine("Creating the sound engine failed. Fallback in place. Check sound.log for details.");
-				Settings.Sound.Engine = "Null";
-				Sound.Create(Settings.Sound.Engine);
-			}
+			Sound = new Sound(Settings.Server.Dedicated ? "Null" : Settings.Sound.Engine);
+
+			GlobalChat = new GlobalChat();

 			Console.WriteLine("Available mods:");
 			foreach (var mod in ModMetadata.AllMods)
@@ -297,18 +283,37 @@ namespace OpenRA
 			Console.WriteLine("Loading mod: {0}", mod);
 			Settings.Game.Mod = mod;

-			Sound.StopMusic();
 			Sound.StopVideo();
 			Sound.Initialize();

 			ModData = new ModData(mod, !Settings.Server.Dedicated);
-			ModData.InitializeLoaders();
-			if (!Settings.Server.Dedicated)
-				Renderer.InitializeFonts(ModData.Manifest);

 			using (new PerfTimer("LoadMaps"))
 				ModData.MapCache.LoadMaps();

+			if (Settings.Server.Dedicated)
+			{
+				RunDedicatedServer();
+				Environment.Exit(0);
+			}
+
+			var installData = ModData.Manifest.Get<ContentInstaller>();
+			var isModContentInstalled = installData.TestFiles.All(f => File.Exists(Platform.ResolvePath(f)));
+
+			// Mod assets are missing!
+			if (!isModContentInstalled)
+			{
+				InitializeMod("modchooser", new Arguments());
+				return;
+			}
+
+			ModData.MountFiles();
+			ModData.InitializeLoaders();
+			Renderer.InitializeFonts(ModData.Manifest);
+
+			if (Cursor != null)
+				Cursor.Dispose();
+
 			if (Settings.Graphics.HardwareCursors)
 			{
 				try
@@ -337,39 +342,43 @@ namespace OpenRA

 			JoinLocal();

-			if (Settings.Server.Dedicated)
+			ModData.LoadScreen.StartGame(args);
+		}
+
+		public static void RunDedicatedServer()
+		{
+			while (true)
 			{
+				Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
+				Settings.Save();
+				CreateServer(new ServerSettings(Settings.Server));
+
 				while (true)
 				{
-					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
-					Settings.Save();
-					CreateServer(new ServerSettings(Settings.Server));
-					while (true)
+					Thread.Sleep(100);
+
+					if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
 					{
-						Thread.Sleep(100);
-
-						if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
-						{
-							Console.WriteLine("No one is playing, shutting down...");
-							server.Shutdown();
-							break;
-						}
+						Console.WriteLine("No one is playing, shutting down...");
+						server.Shutdown();
+						break;
 					}
-
-					if (Settings.Server.DedicatedLoop)
-					{
-						Console.WriteLine("Starting a new server instance...");
-						ModData.MapCache.LoadMaps();
-						continue;
-					}
-
-					break;
 				}

-				Environment.Exit(0);
+				if (Settings.Server.DedicatedLoop)
+				{
+					Console.WriteLine("Starting a new server instance...");
+					ModData.MapCache.LoadMaps();
+					continue;
+				}
+
+				break;
 			}
-			else
-				ModData.LoadScreen.StartGame(args);
+		}
+
+		public static void LoadEditor(string mapUid)
+		{
+			StartGame(mapUid, WorldType.Editor);
 		}

 		public static void LoadShellMap()
@@ -397,9 +406,38 @@ namespace OpenRA

 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the worldactor.
-		static ActionQueue delayedActions = new ActionQueue();
-		public static void RunAfterTick(Action a) { delayedActions.Add(a); }
-		public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
+		static volatile ActionQueue delayedActions = new ActionQueue();
+		public static void RunAfterTick(Action a) { delayedActions.Add(a, Game.RunTime); }
+		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, Game.RunTime + delayMilliseconds); }
+
+		static void TakeScreenshotInner()
+		{
+			Log.Write("debug", "Taking screenshot");
+
+			Bitmap bitmap;
+			using (new PerfTimer("Renderer.TakeScreenshot"))
+				bitmap = Renderer.Device.TakeScreenshot();
+
+			ThreadPool.QueueUserWorkItem(_ =>
+			{
+				var mod = ModData.Manifest.Mod;
+				var directory = Platform.ResolvePath("^", "Screenshots", mod.Id, mod.Version);
+				Directory.CreateDirectory(directory);
+
+				var filename = TimestampedFilename();
+				var format = Settings.Graphics.ScreenshotFormat;
+				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
+					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
+				var destination = Path.Combine(directory, string.Concat(filename, extension));
+
+				using (new PerfTimer("Save Screenshot ({0})".F(format)))
+					bitmap.Save(destination, format);
+
+				bitmap.Dispose();
+
+				Game.RunAfterTick(() => Debug("Saved screenshot " + filename));
+			});
+		}

 		static void InnerLogicTick(OrderManager orderManager)
 		{
@@ -471,7 +509,7 @@ namespace OpenRA

 		static void LogicTick()
 		{
-			delayedActions.PerformActions();
+			delayedActions.PerformActions(Game.RunTime);

 			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
@@ -484,6 +522,8 @@ namespace OpenRA
 				InnerLogicTick(worldRenderer.World.OrderManager);
 		}

+		public static bool TakeScreenshot = false;
+
 		static void RenderTick()
 		{
 			using (new PerfSample("render"))
@@ -517,6 +557,12 @@ namespace OpenRA

 				using (new PerfSample("render_flip"))
 					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
+
+				if (TakeScreenshot)
+				{
+					TakeScreenshot = false;
+					TakeScreenshotInner();
+				}
 			}

 			PerfHistory.Items["render"].Tick();
@@ -648,6 +694,9 @@ namespace OpenRA
 				worldRenderer.Dispose();
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
+
+			GlobalChat.Dispose();
+			Sound.Dispose();
 			Renderer.Dispose();

 			OnQuit();
@@ -718,7 +767,7 @@ namespace OpenRA

 		public static bool IsCurrentWorld(World world)
 		{
-			return OrderManager != null && OrderManager.World == world;
+			return OrderManager != null && OrderManager.World == world && !world.Disposing;
 		}
 	}
 }
--- a/OpenRA.Game/GameInformation.cs
+++ b/OpenRA.Game/GameInformation.cs
@@ -24,20 +24,20 @@ namespace OpenRA
 		public string MapUid;
 		public string MapTitle;

+		/// <summary>Game start timestamp (when the recoding started).</summary>
 		public DateTime StartTimeUtc;

-		// Game end timestamp (when the recoding stopped).
+		/// <summary>Game end timestamp (when the recoding stopped).</summary>
 		public DateTime EndTimeUtc;

-		// Gets the game's duration, from the time the game started until the
-		// replay recording stopped.
+		/// <summary>Gets the game's duration, from the time the game started until the replay recording stopped.</summary>
 		public TimeSpan Duration { get { return EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero; } }
 		public IList<Player> Players { get; private set; }
 		public MapPreview MapPreview { get { return Game.ModData.MapCache[MapUid]; } }
 		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
 		public bool IsSinglePlayer { get { return HumanPlayers.Count() == 1; } }

-		Dictionary<OpenRA.Player, Player> playersByRuntime;
+		readonly Dictionary<OpenRA.Player, Player> playersByRuntime;

 		public GameInformation()
 		{
@@ -70,7 +70,7 @@ namespace OpenRA

 				return info;
 			}
-			catch (InvalidOperationException)
+			catch (YamlException)
 			{
 				Log.Write("debug", "GameInformation deserialized invalid MiniYaml:\n{0}".F(data));
 				throw;
@@ -79,9 +79,10 @@ namespace OpenRA

 		public string Serialize()
 		{
-			var nodes = new List<MiniYamlNode>();
-
-			nodes.Add(new MiniYamlNode("Root", FieldSaver.Save(this)));
+			var nodes = new List<MiniYamlNode>
+			{
+				new MiniYamlNode("Root", FieldSaver.Save(this))
+			};

 			for (var i = 0; i < Players.Count; i++)
 				nodes.Add(new MiniYamlNode("Player@{0}".F(i), FieldSaver.Save(Players[i])));
@@ -89,7 +90,7 @@ namespace OpenRA
 			return nodes.WriteToString();
 		}

-		// Adds the player information at start-up.
+		/// <summary>Adds the player information at start-up.</summary>
 		public void AddPlayer(OpenRA.Player runtimePlayer, Session lobbyInfo)
 		{
 			if (runtimePlayer == null)
@@ -113,12 +114,12 @@ namespace OpenRA
 				Name = runtimePlayer.PlayerName,
 				IsHuman = !runtimePlayer.IsBot,
 				IsBot = runtimePlayer.IsBot,
-				FactionName = runtimePlayer.Country.Name,
-				FactionId = runtimePlayer.Country.Race,
+				FactionName = runtimePlayer.Faction.Name,
+				FactionId = runtimePlayer.Faction.InternalName,
 				Color = runtimePlayer.Color,
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
-				IsRandomFaction = runtimePlayer.Country.Race != client.Race,
+				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Faction,
 				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
 			};

@@ -126,7 +127,7 @@ namespace OpenRA
 			Players.Add(player);
 		}

-		// Gets the player information for the specified runtime player instance.
+		/// <summary>Gets the player information for the specified runtime player instance.</summary>
 		public Player GetPlayer(OpenRA.Player runtimePlayer)
 		{
 			Player player;
@@ -138,38 +139,43 @@ namespace OpenRA

 		public class Player
 		{
-			// Start-up information
+			#region Start-up information
+
 			public int ClientIndex;

-			// The player name, not guaranteed to be unique.
+			/// <summary>The player name, not guaranteed to be unique.</summary>
 			public string Name;
 			public bool IsHuman;
 			public bool IsBot;

-			// The faction name (aka Country)
+			/// <summary>The faction's display name.</summary>
 			public string FactionName;

-			// The faction id (aka Country, aka Race)
+			/// <summary>The faction ID, a.k.a. the faction's internal name.</summary>
 			public string FactionId;
 			public HSLColor Color;

-			// The team id on start-up, or 0 if the player is not part of the team.
+			/// <summary>The team ID on start-up, or 0 if the player is not part of a team.</summary>
 			public int Team;
 			public int SpawnPoint;

-			// True if the faction was chosen at random; otherwise, false
+			/// <summary>True if the faction was chosen at random; otherwise, false.</summary>
 			public bool IsRandomFaction;

-			// True if the spawn point was chosen at random; otherwise, false.</summary>
+			/// <summary>True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;

-			// Information gathered at a later stage
+			#endregion

-			// The game outcome for this player
+			#region
+
+			/// <summary>The game outcome for this player.</summary>
 			public WinState Outcome;

-			// The time when this player won or lost the game
+			/// <summary>The time when this player won or lost the game.</summary>
 			public DateTime OutcomeTimestampUtc;
+
+			#endregion
 		}
 	}
 }
--- a/OpenRA.Game/GameRules/ActorInfo.cs
+++ b/OpenRA.Game/GameRules/ActorInfo.cs
@@ -16,29 +16,50 @@ using OpenRA.Traits;

 namespace OpenRA
 {
-	// TODO: This is not exported into the documentation yet.
-	[Desc("A unit/building inside the game. Every rules starts with one and adds trait to it.",
-		"Special actors like world or player are usually defined in system.yaml and affect everything.")]
+	/// <summary>
+	/// A unit/building inside the game. Every rules starts with one and adds trait to it.
+	/// </summary>
 	public class ActorInfo
 	{
-		[Desc("The actor name can be anything, but the sprites used in the Render*: traits default to this one.",
-			"If you add an ^ in front of the name, the engine will recognize this as a collection of traits",
-			"that can be inherited by others (using Inherits:) and not a real unit.",
-			"You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.")]
+		/// <summary>
+		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
+		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
+		/// that can be inherited by others (using Inherits:) and not a real unit.
+		/// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.
+		/// </summary>
 		public readonly string Name;
-		public readonly TypeDictionary Traits = new TypeDictionary();
+		readonly TypeDictionary traits = new TypeDictionary();
 		List<ITraitInfo> constructOrderCache = null;

 		public ActorInfo(string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
 			try
 			{
-				var mergedNode = MergeWithParent(node, allUnits).ToDictionary();
+				var allParents = new HashSet<string>();
+				var abstractActorType = name.StartsWith("^");
+
+				// Guard against circular inheritance
+				allParents.Add(name);
+				var mergedNode = MergeWithParents(node, allUnits, allParents).ToDictionary();

 				Name = name;
+
 				foreach (var t in mergedNode)
-					if (t.Key != "Inherits" && !t.Key.StartsWith("-"))
-						Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+				{
+					if (t.Key[0] == '-')
+						throw new YamlException("Bogus trait removal: " + t.Key);
+
+					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
+						try
+						{
+							traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+						}
+						catch (FieldLoader.MissingFieldsException e)
+						{
+							if (!abstractActorType)
+								throw new YamlException(e.Message);
+						}
+				}
 			}
 			catch (YamlException e)
 			{
@@ -46,32 +67,38 @@ namespace OpenRA
 			}
 		}

-		static MiniYaml GetParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+		public ActorInfo(string name, params ITraitInfo[] traitInfos)
 		{
-			MiniYaml inherits;
-			node.ToDictionary().TryGetValue("Inherits", out inherits);
-			if (inherits == null || string.IsNullOrEmpty(inherits.Value))
-				return null;
-
-			MiniYaml parent;
-			allUnits.TryGetValue(inherits.Value, out parent);
-			if (parent == null)
-				throw new InvalidOperationException(
-					"Bogus inheritance -- actor type {0} does not exist".F(inherits.Value));
-
-			return parent;
+			Name = name;
+			foreach (var t in traitInfos)
+				traits.Add(t);
 		}

-		static MiniYaml MergeWithParent(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
+		static Dictionary<string, MiniYaml> GetParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
-			var parent = GetParent(node, allUnits);
-			if (parent != null)
+			return node.Nodes.Where(n => n.Key == "Inherits" || n.Key.StartsWith("Inherits@"))
+				.ToDictionary(n => n.Value.Value, n =>
 			{
-				var result = MiniYaml.MergeStrict(node, MergeWithParent(parent, allUnits));
+				MiniYaml i;
+					if (!allUnits.TryGetValue(n.Value.Value, out i))
+						throw new YamlException(
+							"Bogus inheritance -- parent type {0} does not exist".F(n.Value.Value));

-				// strip the '-'
-				result.Nodes.RemoveAll(a => a.Key.StartsWith("-"));
-				return result;
+				return i;
+			});
+		}
+
+		static MiniYaml MergeWithParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits, HashSet<string> allParents)
+		{
+			var parents = GetParents(node, allUnits);
+
+			foreach (var kv in parents)
+			{
+				if (!allParents.Add(kv.Key))
+					throw new YamlException(
+						"Bogus inheritance -- duplicate inheritance of {0}.".F(kv.Key));
+
+				node = MiniYaml.MergeStrict(node, MergeWithParents(kv.Value, allUnits, allParents));
 			}

 			return node;
@@ -83,7 +110,16 @@ namespace OpenRA
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
 			var info = Game.CreateObject<ITraitInfo>(traitName + "Info");
-			FieldLoader.Load(info, my);
+			try
+			{
+				FieldLoader.Load(info, my);
+			}
+			catch (FieldLoader.MissingFieldsException e)
+			{
+				var header = "Trait name " + traitName + ": " + (e.Missing.Length > 1 ? "Required properties missing" : "Required property missing");
+				throw new FieldLoader.MissingFieldsException(e.Missing, header);
+			}
+
 			return info;
 		}

@@ -92,7 +128,7 @@ namespace OpenRA
 			if (constructOrderCache != null)
 				return constructOrderCache;

-			var source = Traits.WithInterface<ITraitInfo>().Select(i => new
+			var source = traits.WithInterface<ITraitInfo>().Select(i => new
 			{
 				Trait = i,
 				Type = i.GetType(),
@@ -143,7 +179,7 @@ namespace OpenRA

 		public IEnumerable<Pair<string, Type>> GetInitKeys()
 		{
-			var inits = Traits.WithInterface<ITraitInfo>().SelectMany(
+			var inits = traits.WithInterface<ITraitInfo>().SelectMany(
 				t => t.GetType().GetInterfaces()
 					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
 					.Select(i => i.GetGenericArguments()[0])).ToList();
@@ -154,5 +190,10 @@ namespace OpenRA
 				i => Pair.New(
 					i.Name.Replace("Init", ""), i));
 		}
+
+		public bool HasTraitInfo<T>() where T : ITraitInfo { return traits.Contains<T>(); }
+		public T TraitInfo<T>() where T : ITraitInfo { return traits.Get<T>(); }
+		public T TraitInfoOrDefault<T>() where T : ITraitInfo { return traits.GetOrDefault<T>(); }
+		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfo { return traits.WithInterface<T>(); }
 	}
 }
--- a/OpenRA.Game/GameRules/MusicInfo.cs
+++ b/OpenRA.Game/GameRules/MusicInfo.cs
@@ -15,8 +15,10 @@ namespace OpenRA.GameRules
 {
 	public class MusicInfo
 	{
-		public readonly string Filename = null;
-		public readonly string Title = null;
+		public readonly string Filename;
+		public readonly string Title;
+		public readonly bool Hidden;
+
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }

@@ -25,30 +27,26 @@ namespace OpenRA.GameRules
 			Title = value.Value;

 			var nd = value.ToDictionary();
+			if (nd.ContainsKey("Hidden"))
+				bool.TryParse(nd["Hidden"].Value, out Hidden);
+
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
-			if (!GlobalFileSystem.Exists(Filename))
-				return;
-
-			Exists = true;
-			using (var s = GlobalFileSystem.Open(Filename))
-				if (Filename.ToLowerInvariant().EndsWith("wav"))
-					Length = (int)WavLoader.WaveLength(s);
-				else
-					Length = (int)AudLoader.SoundLength(s);
 		}

-		public void Reload()
+		public void Load()
 		{
 			if (!GlobalFileSystem.Exists(Filename))
 				return;

 			Exists = true;
 			using (var s = GlobalFileSystem.Open(Filename))
+			{
 				if (Filename.ToLowerInvariant().EndsWith("wav"))
 					Length = (int)WavLoader.WaveLength(s);
 				else
 					Length = (int)AudLoader.SoundLength(s);
+			}
 		}
 	}
 }
--- a/OpenRA.Game/GameRules/Ruleset.cs
+++ b/OpenRA.Game/GameRules/Ruleset.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
+using OpenRA.Traits;

 namespace OpenRA
 {
@@ -41,6 +42,40 @@ namespace OpenRA
 			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
 			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
 			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
+
+			foreach (var a in Actors.Values)
+			{
+				foreach (var t in a.TraitInfos<IRulesetLoaded>())
+				{
+					try
+					{
+						t.RulesetLoaded(this, a);
+					}
+					catch (YamlException e)
+					{
+						throw new YamlException("Actor type {0}: {1}".F(a.Name, e.Message));
+					}
+				}
+			}
+
+			foreach (var weapon in Weapons)
+			{
+				foreach (var warhead in weapon.Value.Warheads)
+				{
+					var cacher = warhead as IRulesetLoaded<WeaponInfo>;
+					if (cacher != null)
+					{
+						try
+						{
+							cacher.RulesetLoaded(this, weapon.Value);
+						}
+						catch (YamlException e)
+						{
+							throw new YamlException("Weapon type {0}: {1}".F(weapon.Key, e.Message));
+						}
+					}
+				}
+			}
 		}

 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
--- a/OpenRA.Game/GameRules/RulesetCache.cs
+++ b/OpenRA.Game/GameRules/RulesetCache.cs
@@ -19,6 +19,8 @@ namespace OpenRA
 {
 	public sealed class RulesetCache : IDisposable
 	{
+		static readonly List<MiniYamlNode> NoMapRules = new List<MiniYamlNode>();
+
 		readonly ModData modData;

 		readonly Dictionary<string, ActorInfo> actorCache = new Dictionary<string, ActorInfo>();
@@ -41,12 +43,11 @@ namespace OpenRA
 			this.modData = modData;
 		}

-		public Ruleset LoadDefaultRules()
-		{
-			return LoadMapRules(new Map());
-		}
-
-		public Ruleset LoadMapRules(Map map)
+		/// <summary>
+		/// Cache and return the Ruleset for a given map.
+		/// If a map isn't specified then return the default mod Ruleset.
+		/// </summary>
+		public Ruleset Load(Map map = null)
 		{
 			var m = modData.Manifest;

@@ -58,20 +59,34 @@ namespace OpenRA
 			Dictionary<string, TileSet> tileSets;

 			using (new PerfTimer("Actors"))
-				actors = LoadYamlRules(actorCache, m.Rules, map.RuleDefinitions, (k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
+				actors = LoadYamlRules(actorCache, m.Rules,
+					map != null ? map.RuleDefinitions : NoMapRules,
+					(k, y) => new ActorInfo(k.Key.ToLowerInvariant(), k.Value, y));
+
 			using (new PerfTimer("Weapons"))
-				weapons = LoadYamlRules(weaponCache, m.Weapons, map.WeaponDefinitions, (k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+				weapons = LoadYamlRules(weaponCache, m.Weapons,
+					map != null ? map.WeaponDefinitions : NoMapRules,
+					(k, _) => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
+
 			using (new PerfTimer("Voices"))
-				voices = LoadYamlRules(voiceCache, m.Voices, map.VoiceDefinitions, (k, _) => new SoundInfo(k.Value));
+				voices = LoadYamlRules(voiceCache, m.Voices,
+					map != null ? map.VoiceDefinitions : NoMapRules,
+					(k, _) => new SoundInfo(k.Value));
+
 			using (new PerfTimer("Notifications"))
-				notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
+				notifications = LoadYamlRules(notificationCache, m.Notifications,
+					map != null ? map.NotificationDefinitions : NoMapRules,
+					(k, _) => new SoundInfo(k.Value));
+
 			using (new PerfTimer("Music"))
-				music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
+				music = LoadYamlRules(musicCache, m.Music,
+					map != null ? map.MusicDefinitions : NoMapRules,
+					(k, _) => new MusicInfo(k.Key, k.Value));
+
 			using (new PerfTimer("TileSets"))
 				tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);

 			var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
-
 			return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
 		}

--- a/OpenRA.Game/GameRules/SoundInfo.cs
+++ b/OpenRA.Game/GameRules/SoundInfo.cs
@@ -16,22 +16,14 @@ namespace OpenRA.GameRules
 {
 	public class SoundInfo
 	{
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Variants;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Prefixes;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Voices;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Notifications;
+		public readonly Dictionary<string, string[]> Variants = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Prefixes = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Voices = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Notifications = new Dictionary<string, string[]>();
 		public readonly string DefaultVariant = ".aud";
 		public readonly string DefaultPrefix = "";
-		public readonly string[] DisableVariants = { };
-		public readonly string[] DisablePrefixes = { };
-
-		static Dictionary<string, string[]> Load(MiniYaml y, string name)
-		{
-			var nd = y.ToDictionary();
-			return nd.ContainsKey(name)
-				? nd[name].ToDictionary(my => FieldLoader.GetValue<string[]>("(value)", my.Value))
-				: new Dictionary<string, string[]>();
-		}
+		public readonly HashSet<string> DisableVariants = new HashSet<string>();
+		public readonly HashSet<string> DisablePrefixes = new HashSet<string>();

 		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
 		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
@@ -39,10 +31,6 @@ namespace OpenRA.GameRules
 		public SoundInfo(MiniYaml y)
 		{
 			FieldLoader.Load(this, y);
-			Variants = Load(y, "Variants");
-			Prefixes = Load(y, "Prefixes");
-			Voices = Load(y, "Voices");
-			Notifications = Load(y, "Notifications");

 			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
 			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
--- a/OpenRA.Game/GameRules/WeaponInfo.cs
+++ b/OpenRA.Game/GameRules/WeaponInfo.cs
@@ -19,8 +19,9 @@ namespace OpenRA.GameRules
 	public class ProjectileArgs
 	{
 		public WeaponInfo Weapon;
-		public IEnumerable<int> DamageModifiers;
-		public IEnumerable<int> InaccuracyModifiers;
+		public int[] DamageModifiers;
+		public int[] InaccuracyModifiers;
+		public int[] RangeModifiers;
 		public int Facing;
 		public WPos Source;
 		public Actor SourceActor;
@@ -33,7 +34,7 @@ namespace OpenRA.GameRules
 	public sealed class WeaponInfo
 	{
 		[Desc("The maximum range the weapon can fire.")]
-		public readonly WRange Range = WRange.Zero;
+		public readonly WDist Range = WDist.Zero;

 		[Desc("The sound played when the weapon is fired.")]
 		public readonly string[] Report = null;
@@ -47,31 +48,26 @@ namespace OpenRA.GameRules
 		public readonly bool Charges = false;

 		[Desc("What types of targets are affected.")]
-		public readonly string[] ValidTargets = { "Ground", "Water" };
+		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };

 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
-		public readonly string[] InvalidTargets = { };
+		public readonly HashSet<string> InvalidTargets = new HashSet<string>();

 		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
 		public readonly int BurstDelay = 5;

 		[Desc("The minimum range the weapon can fire.")]
-		public readonly WRange MinRange = WRange.Zero;
+		public readonly WDist MinRange = WDist.Zero;

 		[FieldLoader.LoadUsing("LoadProjectile")]
 		public readonly IProjectileInfo Projectile;

 		[FieldLoader.LoadUsing("LoadWarheads")]
-		public readonly List<Warhead> Warheads = new List<Warhead>();
-
-		readonly HashSet<string> validTargetSet;
-		readonly HashSet<string> invalidTargetSet;
+		public readonly List<IWarhead> Warheads = new List<IWarhead>();

 		public WeaponInfo(string name, MiniYaml content)
 		{
 			FieldLoader.Load(this, content);
-			validTargetSet = new HashSet<string>(ValidTargets);
-			invalidTargetSet = new HashSet<string>(InvalidTargets);
 		}

 		static object LoadProjectile(MiniYaml yaml)
@@ -86,10 +82,10 @@ namespace OpenRA.GameRules

 		static object LoadWarheads(MiniYaml yaml)
 		{
-			var retList = new List<Warhead>();
+			var retList = new List<IWarhead>();
 			foreach (var node in yaml.Nodes.Where(n => n.Key.StartsWith("Warhead")))
 			{
-				var ret = Game.CreateObject<Warhead>(node.Value.Value + "Warhead");
+				var ret = Game.CreateObject<IWarhead>(node.Value.Value + "Warhead");
 				FieldLoader.Load(ret, node.Value);
 				retList.Add(ret);
 			}
@@ -99,7 +95,7 @@ namespace OpenRA.GameRules

 		public bool IsValidTarget(IEnumerable<string> targetTypes)
 		{
-			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+			return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
 		}

 		/// <summary>Checks if the weapon is valid against (can target) the target.</summary>
@@ -130,8 +126,8 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
-			var targetable = victim.TraitOrDefault<ITargetable>();
-			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
+			var targetable = victim.TraitsImplementing<ITargetable>().Where(Exts.IsTraitEnabled);
+			if (!IsValidTarget(targetable.SelectMany(t => t.TargetTypes)))
 				return false;

 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
@@ -143,8 +139,7 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>
 		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
 		{
-			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
+			if (!IsValidTarget(victim.TargetTypes))
 				return false;

 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
--- a/OpenRA.Game/GameSpeed.cs
+++ b/OpenRA.Game/GameSpeed.cs
@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA
+{
+	public class GameSpeed
+	{
+		[Translate]
+		public readonly string Name = "Default";
+		public readonly int Timestep = 40;
+		public readonly int OrderLatency = 3;
+	}
+
+	public class GameSpeeds : IGlobalModData
+	{
+		[FieldLoader.LoadUsing("LoadSpeeds")]
+		public readonly Dictionary<string, GameSpeed> Speeds;
+
+		static object LoadSpeeds(MiniYaml y)
+		{
+			var ret = new Dictionary<string, GameSpeed>();
+			foreach (var node in y.Nodes)
+				ret.Add(node.Key, FieldLoader.Load<GameSpeed>(node.Value));
+
+			return ret;
+		}
+	}
+}
--- a/OpenRA.Game/GlobalChat.cs
+++ b/OpenRA.Game/GlobalChat.cs
@@ -0,0 +1,382 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Meebey.SmartIrc4net;
+using OpenRA;
+using OpenRA.Primitives;
+
+namespace OpenRA.Chat
+{
+	public enum ChatConnectionStatus { Disconnected, Connecting, Connected, Disconnecting, Joined, Error }
+	public enum ChatMessageType { Message, Notification }
+
+	public sealed class ChatUser
+	{
+		public readonly string Name;
+		public bool IsOp;
+		public bool IsVoiced;
+
+		public ChatUser(string name, bool isOp, bool isVoice)
+		{
+			Name = name;
+			IsOp = isOp;
+			IsVoiced = isVoice;
+		}
+	}
+
+	public sealed class ChatMessage
+	{
+		static long nextUID;
+
+		public readonly DateTime Time;
+		public readonly ChatMessageType Type;
+		public readonly string Nick;
+		public readonly string Message;
+		public readonly string UID;
+
+		public ChatMessage(DateTime time, ChatMessageType type, string nick, string message)
+		{
+			Time = time;
+			Type = type;
+			Nick = nick;
+			Message = message;
+
+			UID = Interlocked.Increment(ref nextUID).ToString();
+		}
+
+		public override string ToString()
+		{
+			var time = Time.ToString(Game.Settings.Chat.TimestampFormat);
+			if (Type == ChatMessageType.Notification)
+				return "{0} {1}".F(time, Message);
+
+			return "{0} {1}: {2}".F(time, Nick, Message);
+		}
+	}
+
+	public class GlobalChat : IDisposable
+	{
+		readonly IrcClient client = new IrcClient();
+		volatile Channel channel;
+
+		public readonly ObservableSortedDictionary<string, ChatUser> Users = new ObservableSortedDictionary<string, ChatUser>(StringComparer.InvariantCultureIgnoreCase);
+		public readonly ObservableList<ChatMessage> History = new ObservableList<ChatMessage>();
+
+		volatile string topic;
+		public string Topic { get { return topic; } }
+
+		volatile ChatConnectionStatus connectionStatus = ChatConnectionStatus.Disconnected;
+		public ChatConnectionStatus ConnectionStatus { get { return connectionStatus; } }
+
+		public GlobalChat()
+		{
+			client.Encoding = System.Text.Encoding.UTF8;
+			client.SendDelay = 100;
+			client.ActiveChannelSyncing = true;
+
+			client.OnConnecting += OnConnecting;
+			client.OnConnected += OnConnected;
+			client.OnDisconnecting += OnDisconnecting;
+			client.OnDisconnected += OnDisconnected;
+			client.OnError += OnError;
+			client.OnKick += OnKick;
+
+			client.OnRawMessage += (_, e) => Game.RunAfterTick(() => Log.Write("irc", e.Data.RawMessage));
+			client.OnJoin += OnJoin;
+			client.OnChannelActiveSynced += OnChannelActiveSynced;
+			client.OnTopic += (_, e) => topic = e.Topic;
+			client.OnTopicChange += (_, e) => topic = e.NewTopic;
+			client.OnNickChange += OnNickChange;
+
+			client.OnChannelMessage += (_, e) => AddMessage(e.Data.Nick, e.Data.Message);
+			client.OnOp += (_, e) => SetUserOp(e.Whom, true);
+			client.OnDeop += (_, e) => SetUserOp(e.Whom, false);
+			client.OnVoice += (_, e) => SetUserVoiced(e.Whom, true);
+			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
+			client.OnPart += OnPart;
+			client.OnQuit += OnQuit;
+		}
+
+		void SetUserOp(string whom, bool isOp)
+		{
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (Users.TryGetValue(whom, out user))
+					user.IsOp = isOp;
+			});
+		}
+
+		void SetUserVoiced(string whom, bool isVoiced)
+		{
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (Users.TryGetValue(whom, out user))
+					user.IsVoiced = isVoiced;
+			});
+		}
+
+		public void Connect()
+		{
+			if (client.IsConnected)
+				return;
+
+			new Thread(() =>
+			{
+				try
+				{
+					client.Connect(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port);
+				}
+				catch (Exception e)
+				{
+					connectionStatus = ChatConnectionStatus.Error;
+					AddNotification(e.Message);
+					Game.RunAfterTick(() => Log.Write("irc", e.ToString()));
+
+					return;
+				}
+
+				client.Listen();
+			}) { Name = "IrcListenThread", IsBackground = true }.Start();
+		}
+
+		void AddNotification(string text)
+		{
+			var message = new ChatMessage(DateTime.Now, ChatMessageType.Notification, null, text);
+			Game.RunAfterTick(() =>
+			{
+				History.Add(message);
+				Log.Write("irc", text);
+			});
+		}
+
+		void AddMessage(string nick, string text)
+		{
+			var message = new ChatMessage(DateTime.Now, ChatMessageType.Message, nick, text);
+			Game.RunAfterTick(() =>
+			{
+				History.Add(message);
+				Log.Write("irc", text);
+			});
+		}
+
+		void OnConnecting(object sender, EventArgs e)
+		{
+			AddNotification("Connecting to {0}:{1}...".F(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port));
+			connectionStatus = ChatConnectionStatus.Connecting;
+		}
+
+		void OnConnected(object sender, EventArgs e)
+		{
+			AddNotification("Connected.");
+			connectionStatus = ChatConnectionStatus.Connected;
+
+			// Guard against settings.yaml modification
+			var nick = SanitizedName(Game.Settings.Chat.Nickname);
+			if (nick != Game.Settings.Chat.Nickname)
+				Game.RunAfterTick(() => Game.Settings.Chat.Nickname = nick);
+
+			client.Login(nick, "in-game IRC client", 0, "OpenRA");
+			client.RfcJoin("#" + Game.Settings.Chat.Channel);
+		}
+
+		void OnDisconnecting(object sender, EventArgs e)
+		{
+			if (connectionStatus != ChatConnectionStatus.Error)
+				connectionStatus = ChatConnectionStatus.Disconnecting;
+		}
+
+		void OnDisconnected(object sender, EventArgs e)
+		{
+			Game.RunAfterTick(Users.Clear);
+
+			// Keep the chat window open if there is an error
+			// It will be cleared by the Disconnect button
+			if (connectionStatus != ChatConnectionStatus.Error)
+			{
+				Game.RunAfterTick(History.Clear);
+				topic = null;
+				connectionStatus = ChatConnectionStatus.Disconnected;
+			}
+		}
+
+		void OnError(object sender, ErrorEventArgs e)
+		{
+			// Ignore any errors that happen during disconnect
+			if (connectionStatus != ChatConnectionStatus.Disconnecting)
+			{
+				connectionStatus = ChatConnectionStatus.Error;
+				AddNotification("Error: " + e.ErrorMessage);
+			}
+		}
+
+		void OnKick(object sender, KickEventArgs e)
+		{
+			Disconnect();
+			connectionStatus = ChatConnectionStatus.Error;
+			AddNotification("Error: You were kicked from the chat by {0}".F(e.Who));
+		}
+
+		void OnJoin(object sender, JoinEventArgs e)
+		{
+			if (e.Who == client.Nickname || e.Channel != channel.Name)
+				return;
+
+			AddNotification("{0} joined the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Add(e.Who, new ChatUser(e.Who, false, false)));
+		}
+
+		void OnChannelActiveSynced(object sender, IrcEventArgs e)
+		{
+			channel = client.GetChannel(e.Data.Channel);
+			AddNotification("{0} users online".F(channel.Users.Count));
+			connectionStatus = ChatConnectionStatus.Joined;
+
+			foreach (DictionaryEntry user in channel.Users)
+			{
+				var u = (ChannelUser)user.Value;
+				Game.RunAfterTick(() => Users.Add(u.Nick, new ChatUser(u.Nick, u.IsOp, u.IsVoice)));
+			}
+		}
+
+		void OnNickChange(object sender, NickChangeEventArgs e)
+		{
+			AddNotification("{0} is now known as {1}.".F(e.OldNickname, e.NewNickname));
+
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (!Users.TryGetValue(e.OldNickname, out user))
+					return;
+
+				Users.Remove(e.OldNickname);
+				Users.Add(e.NewNickname, new ChatUser(e.NewNickname, user.IsOp, user.IsVoiced));
+			});
+		}
+
+		void OnQuit(object sender, QuitEventArgs e)
+		{
+			AddNotification("{0} left the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Remove(e.Who));
+		}
+
+		void OnPart(object sender, PartEventArgs e)
+		{
+			if (e.Data.Channel != channel.Name)
+				return;
+
+			AddNotification("{0} left the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Remove(e.Who));
+		}
+
+		public string SanitizedName(string dirty)
+		{
+			if (string.IsNullOrEmpty(dirty))
+				return null;
+
+			// There is no need to mangle the nick if it is already valid
+			if (Rfc2812.IsValidNickname(dirty))
+				return dirty;
+
+			// TODO: some special chars are allowed as well, but not at every position
+			var clean = new string(dirty.Where(c => char.IsLetterOrDigit(c)).ToArray());
+
+			if (string.IsNullOrEmpty(clean))
+				return null;
+
+			if (char.IsDigit(clean[0]))
+				return SanitizedName(clean.Substring(1));
+
+			// Source: https://tools.ietf.org/html/rfc2812#section-1.2.1
+			if (clean.Length > 9)
+				clean = clean.Substring(0, 9);
+
+			return clean;
+		}
+
+		public bool IsValidNickname(string name)
+		{
+			return Rfc2812.IsValidNickname(name);
+		}
+
+		public void SendMessage(string text)
+		{
+			if (connectionStatus != ChatConnectionStatus.Joined)
+				return;
+
+			// Guard against a last-moment disconnection
+			try
+			{
+				client.SendMessage(SendType.Message, channel.Name, text);
+				AddMessage(client.Nickname, text);
+			}
+			catch (NotConnectedException) { }
+		}
+
+		public bool TrySetNickname(string nick)
+		{
+			// TODO: This is inconsistent with the other check
+			if (Rfc2812.IsValidNickname(nick))
+			{
+				client.RfcNick(nick);
+				Game.Settings.Chat.Nickname = nick;
+				return true;
+			}
+
+			return false;
+		}
+
+		public void Disconnect()
+		{
+			// Error is an alias for disconnect, but keeps the panel open
+			// so that clients can see the error
+			if (connectionStatus == ChatConnectionStatus.Error)
+			{
+				Game.RunAfterTick(History.Clear);
+				topic = null;
+				connectionStatus = ChatConnectionStatus.Disconnected;
+			}
+			else
+				connectionStatus = ChatConnectionStatus.Disconnecting;
+
+			if (!client.IsConnected)
+				return;
+
+			client.RfcQuit(Game.Settings.Chat.QuitMessage);
+
+			AddNotification("Disconnecting from {0}...".F(client.Address));
+
+			Game.RunAfterTick(() => Game.Settings.Chat.ConnectAutomatically = false);
+		}
+
+		public void Dispose()
+		{
+			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
+			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
+			// native code so this abort call hangs until the network socket reads something and returns to managed
+			// code where it can then be aborted.
+			//
+			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
+			// closing.
+			//
+			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
+			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
+			// properly. Since our process is about to die anyway, it's not like anyone will care.
+			////if (client.IsConnected)
+			////	client.Disconnect();
+		}
+	}
+}
--- a/OpenRA.Game/Graphics/Animation.cs
+++ b/OpenRA.Game/Graphics/Animation.cs
@@ -10,6 +10,8 @@

 using System;
 using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Support;

 namespace OpenRA.Graphics
 {
@@ -47,7 +49,7 @@ namespace OpenRA.Graphics
 			this.facingFunc = facingFunc;
 		}

-		int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }

 		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
@@ -139,6 +141,24 @@ namespace OpenRA.Graphics
 			tickFunc = () => frame = func();
 		}

+		public void PlayFetchDirection(string sequenceName, Func<int> direction)
+		{
+			tickAlways = false;
+			CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
+			timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
+
+			frame = 0;
+			tickFunc = () =>
+			{
+				var d = direction();
+				if (d > 0 && ++frame >= CurrentSequence.Length)
+					frame = 0;
+
+				if (d < 0 && --frame < 0)
+					frame = CurrentSequence.Length - 1;
+			};
+		}
+
 		int timeUntilNextFrame;
 		Action tickFunc;

@@ -181,5 +201,10 @@ namespace OpenRA.Graphics
 		{
 			return sequenceProvider.GetSequence(name, sequenceName);
 		}
+
+		public string GetRandomExistingSequence(string[] sequences, MersenneTwister random)
+		{
+			return sequences.Where(s => HasSequence(s)).RandomOrDefault(random);
+		}
 	}
 }
--- a/OpenRA.Game/Graphics/ChromeProvider.cs
+++ b/OpenRA.Game/Graphics/ChromeProvider.cs
@@ -106,7 +106,7 @@ namespace OpenRA.Graphics
 				sheet = cachedSheets[mi.Src];
 			else
 			{
-				sheet = new Sheet(mi.Src);
+				sheet = new Sheet(SheetType.BGRA, mi.Src);
 				cachedSheets.Add(mi.Src, sheet);
 			}

--- a/OpenRA.Game/Graphics/HSLColor.cs
+++ b/OpenRA.Game/Graphics/HSLColor.cs
@@ -9,10 +9,11 @@
 #endregion

 using System.Drawing;
+using OpenRA.Scripting;

 namespace OpenRA.Graphics
 {
-	public struct HSLColor
+	public struct HSLColor : IScriptBindable
 	{
 		public readonly byte H;
 		public readonly byte S;
--- a/OpenRA.Game/Graphics/HardwarePalette.cs
+++ b/OpenRA.Game/Graphics/HardwarePalette.cs
@@ -30,6 +30,11 @@ namespace OpenRA.Graphics
 			readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
 		}

+		public bool Contains(string name)
+		{
+			return modifiablePalettes.ContainsKey(name) || palettes.ContainsKey(name);
+		}
+
 		public IPalette GetPalette(string name)
 		{
 			MutablePalette mutable;
--- a/OpenRA.Game/Graphics/IGraphicsDevice.cs
+++ b/OpenRA.Game/Graphics/IGraphicsDevice.cs
@@ -15,11 +15,11 @@ using OpenRA.Graphics;
 namespace OpenRA
 {
 	[AttributeUsage(AttributeTargets.Assembly)]
-	public sealed class RendererAttribute : Attribute
+	public sealed class PlatformAttribute : Attribute
 	{
 		public readonly Type Type;

-		public RendererAttribute(Type graphicsDeviceType)
+		public PlatformAttribute(Type graphicsDeviceType)
 		{
 			if (!typeof(IDeviceFactory).IsAssignableFrom(graphicsDeviceType))
 				throw new InvalidOperationException("Incorrect type in RendererAttribute");
@@ -29,7 +29,8 @@ namespace OpenRA

 	public interface IDeviceFactory
 	{
-		IGraphicsDevice Create(Size size, WindowMode windowMode);
+		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
+		ISoundEngine CreateSound();
 	}

 	public interface IHardwareCursor : IDisposable { }
@@ -41,10 +42,8 @@ namespace OpenRA
 		Additive,
 		Subtractive,
 		Multiply,
-		SoftAdditive,
-		Translucency25,
-		Translucency50,
-		Translucency75
+		Multiplicative,
+		DoubleMultiplicative
 	}

 	public interface IGraphicsDevice : IDisposable
@@ -59,6 +58,7 @@ namespace OpenRA

 		void Clear();
 		void Present();
+		Bitmap TakeScreenshot();
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
 		void DrawPrimitives(PrimitiveType type, int firstVertex, int numVertices);
@@ -83,10 +83,13 @@ namespace OpenRA
 	{
 		void Bind();
 		void SetData(T[] vertices, int length);
+		void SetData(T[] vertices, int start, int length);
+		void SetData(IntPtr data, int start, int length);
 	}

 	public interface IShader
 	{
+		void SetBool(string name, bool value);
 		void SetVec(string name, float x);
 		void SetVec(string name, float x, float y);
 		void SetVec(string name, float[] vec, int length);
--- a/OpenRA.Game/Graphics/LineRenderer.cs
+++ b/OpenRA.Game/Graphics/LineRenderer.cs
@@ -9,6 +9,7 @@
 #endregion

 using System;
+using System.Collections.Generic;
 using System.Drawing;

 namespace OpenRA.Graphics
@@ -19,6 +20,7 @@ namespace OpenRA.Graphics

 		readonly Renderer renderer;
 		readonly IShader shader;
+		readonly Action renderAction;

 		readonly Vertex[] vertices;
 		int nv = 0;
@@ -30,6 +32,11 @@ namespace OpenRA.Graphics
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
+			renderAction = () =>
+			{
+				renderer.SetLineWidth(LineWidth);
+				renderer.DrawBatch(vertices, nv, PrimitiveType.LineList);
+			};
 		}

 		public float LineWidth
@@ -53,14 +60,9 @@ namespace OpenRA.Graphics
 			if (nv > 0)
 			{
 				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(() =>
-				{
-					var vb = renderer.GetTempVertexBuffer();
-					vb.SetData(vertices, nv);
-					renderer.SetLineWidth(LineWidth);
-					renderer.DrawBatch(vb, 0, nv, PrimitiveType.LineList);
-				});
+				shader.Render(renderAction);
 				renderer.Device.SetBlendMode(BlendMode.None);
+
 				nv = 0;
 			}
 		}
@@ -69,10 +71,26 @@ namespace OpenRA.Graphics
 		{
 			var tr = new float2(br.X, tl.Y);
 			var bl = new float2(tl.X, br.Y);
-			DrawLine(tl, tr, c, c);
-			DrawLine(tl, bl, c, c);
-			DrawLine(tr, br, c, c);
-			DrawLine(bl, br, c, c);
+			DrawLine(tl, tr, c);
+			DrawLine(tl, bl, c);
+			DrawLine(tr, br, c);
+			DrawLine(bl, br, c);
+		}
+
+		public void DrawLine(float2 start, float2 end, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (nv + 2 > renderer.TempBufferSize)
+				Flush();
+
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);
+			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
 		}

 		public void DrawLine(float2 start, float2 end, Color startColor, Color endColor)
@@ -82,19 +100,55 @@ namespace OpenRA.Graphics
 			if (nv + 2 > renderer.TempBufferSize)
 				Flush();

-			vertices[nv++] = new Vertex(start + Offset,
-				startColor.R / 255.0f, startColor.G / 255.0f,
-				startColor.B / 255.0f, startColor.A / 255.0f);
+			startColor = Util.PremultiplyAlpha(startColor);
+			var r = startColor.R / 255.0f;
+			var g = startColor.G / 255.0f;
+			var b = startColor.B / 255.0f;
+			var a = startColor.A / 255.0f;
+			vertices[nv++] = new Vertex(start + Offset, r, g, b, a);

-			vertices[nv++] = new Vertex(end + Offset,
-				endColor.R / 255.0f, endColor.G / 255.0f,
-				endColor.B / 255.0f, endColor.A / 255.0f);
+			endColor = Util.PremultiplyAlpha(endColor);
+			r = endColor.R / 255.0f;
+			g = endColor.G / 255.0f;
+			b = endColor.B / 255.0f;
+			a = endColor.A / 255.0f;
+			vertices[nv++] = new Vertex(end + Offset, r, g, b, a);
+		}
+
+		public void DrawLineStrip(IEnumerable<float2> points, Color color)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			color = Util.PremultiplyAlpha(color);
+			var r = color.R / 255.0f;
+			var g = color.G / 255.0f;
+			var b = color.B / 255.0f;
+			var a = color.A / 255.0f;
+
+			var first = true;
+			var prev = new Vertex();
+			foreach (var point in points)
+			{
+				if (first)
+				{
+					first = false;
+					prev = new Vertex(point + Offset, r, g, b, a);
+					continue;
+				}
+
+				if (nv + 2 > renderer.TempBufferSize)
+					Flush();
+
+				vertices[nv++] = prev;
+				prev = new Vertex(point + Offset, r, g, b, a);
+				vertices[nv++] = prev;
+			}
 		}

 		public void FillRect(RectangleF r, Color color)
 		{
 			for (var y = r.Top; y < r.Bottom; y++)
-				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color, color);
+				DrawLine(new float2(r.Left, y), new float2(r.Right, y), color);
 		}

 		public void FillEllipse(RectangleF r, Color color)
@@ -106,7 +160,7 @@ namespace OpenRA.Graphics
 			for (var y = r.Top; y <= r.Bottom; y++)
 			{
 				var dx = a * (float)Math.Sqrt(1 - (y - yc) * (y - yc) / b / b);
-				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color, color);
+				DrawLine(new float2(xc - dx, y), new float2(xc + dx, y), color);
 			}
 		}

--- a/OpenRA.Game/Graphics/Minimap.cs
+++ b/OpenRA.Game/Graphics/Minimap.cs
@@ -20,14 +20,23 @@ namespace OpenRA.Graphics
 	{
 		public static Bitmap TerrainBitmap(TileSet tileset, Map map, bool actualSize = false)
 		{
+			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
 			var b = map.Bounds;
+
+			// Fudge the heightmap offset by adding as much extra as we need / can.
+			// This tries to correct for our incorrect assumption that MPos == PPos
+			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
 			var width = b.Width;
-			var height = b.Height;
+			var height = b.Height + heightOffset;
+
+			var bitmapWidth = width;
+			if (isRectangularIsometric)
+				bitmapWidth = 2 * bitmapWidth - 1;

 			if (!actualSize)
-				width = height = Exts.NextPowerOf2(Math.Max(b.Width, b.Height));
+				bitmapWidth = height = Exts.NextPowerOf2(Math.Max(bitmapWidth, height));

-			var terrain = new Bitmap(width, height);
+			var terrain = new Bitmap(bitmapWidth, height);

 			var bitmapData = terrain.LockBits(terrain.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
@@ -38,16 +47,27 @@ namespace OpenRA.Graphics
 			{
 				var colors = (int*)bitmapData.Scan0;
 				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < b.Height; y++)
+				for (var y = 0; y < height; y++)
 				{
-					for (var x = 0; x < b.Width; x++)
+					for (var x = 0; x < width; x++)
 					{
-						var mapX = x + b.Left;
-						var mapY = y + b.Top;
-						var type = tileset.GetTileInfo(mapTiles[new MPos(mapX, mapY)]);
-						var color = type != null ? type.LeftColor : Color.Black;
+						var uv = new MPos(x + b.Left, y + b.Top);
+						var type = tileset.GetTileInfo(mapTiles[uv]);
+						var leftColor = type != null ? type.LeftColor : Color.Black;

-						colors[y * stride + x] = color.ToArgb();
+						if (isRectangularIsometric)
+						{
+							// Odd rows are shifted right by 1px
+							var dx = uv.V & 1;
+							var rightColor = type != null ? type.RightColor : Color.Black;
+							if (x + dx > 0)
+								colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
+
+							if (2 * x + dx < stride)
+								colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
+						}
+						else
+							colors[y * stride + x] = leftColor.ToArgb();
 					}
 				}
 			}
@@ -61,8 +81,18 @@ namespace OpenRA.Graphics
 		static Bitmap AddStaticResources(TileSet tileset, Map map, Ruleset resourceRules, Bitmap terrainBitmap)
 		{
 			var terrain = new Bitmap(terrainBitmap);
+			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
 			var b = map.Bounds;

+			// Fudge the heightmap offset by adding as much extra as we need / can
+			// This tries to correct for our incorrect assumption that MPos == PPos
+			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
+			var width = b.Width;
+			var height = b.Height + heightOffset;
+
+			var resources = resourceRules.Actors["world"].TraitInfos<ResourceTypeInfo>()
+				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
+
 			var bitmapData = terrain.LockBits(terrain.Bounds(),
 				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);

@@ -70,23 +100,31 @@ namespace OpenRA.Graphics
 			{
 				var colors = (int*)bitmapData.Scan0;
 				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < b.Height; y++)
+				for (var y = 0; y < height; y++)
 				{
-					for (var x = 0; x < b.Width; x++)
+					for (var x = 0; x < width; x++)
 					{
-						var mapX = x + b.Left;
-						var mapY = y + b.Top;
-						if (map.MapResources.Value[new MPos(mapX, mapY)].Type == 0)
+						var uv = new MPos(x + b.Left, y + b.Top);
+						if (map.MapResources.Value[uv].Type == 0)
 							continue;

-						var res = resourceRules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>()
-							.Where(t => t.ResourceType == map.MapResources.Value[new MPos(mapX, mapY)].Type)
-								.Select(t => t.TerrainType).FirstOrDefault();
-
-						if (res == null)
+						string res;
+						if (!resources.TryGetValue(map.MapResources.Value[uv].Type, out res))
 							continue;

-						colors[y * stride + x] = tileset[tileset.GetTerrainIndex(res)].Color.ToArgb();
+						var color = tileset[tileset.GetTerrainIndex(res)].Color.ToArgb();
+						if (isRectangularIsometric)
+						{
+							// Odd rows are shifted right by 1px
+							var dx = uv.V & 1;
+							if (x + dx > 0)
+								colors[y * stride + 2 * x + dx - 1] = color;
+
+							if (2 * x + dx < stride)
+								colors[y * stride + 2 * x + dx] = color;
+						}
+						else
+							colors[y * stride + x] = color;
 					}
 				}
 			}
@@ -96,107 +134,6 @@ namespace OpenRA.Graphics
 			return terrain;
 		}

-		public static Bitmap CustomTerrainBitmap(World world)
-		{
-			var map = world.Map;
-			var b = map.Bounds;
-
-			var size = Exts.NextPowerOf2(Math.Max(b.Width, b.Height));
-			var bitmap = new Bitmap(size, size);
-			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				for (var y = 0; y < b.Height; y++)
-				{
-					for (var x = 0; x < b.Width; x++)
-					{
-						var mapX = x + b.Left;
-						var mapY = y + b.Top;
-						var custom = map.CustomTerrain[new MPos(mapX, mapY)];
-						if (custom == byte.MaxValue)
-							continue;
-						colors[y * stride + x] = world.TileSet[custom].Color.ToArgb();
-					}
-				}
-			}
-
-			bitmap.UnlockBits(bitmapData);
-			return bitmap;
-		}
-
-		public static Bitmap ActorsBitmap(World world)
-		{
-			var map = world.Map;
-			var b = map.Bounds;
-
-			var size = Exts.NextPowerOf2(Math.Max(b.Width, b.Height));
-			var bitmap = new Bitmap(size, size);
-			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				foreach (var t in world.ActorsWithTrait<IRadarSignature>())
-				{
-					if (!t.Actor.IsInWorld || world.FogObscures(t.Actor))
-						continue;
-
-					var color = t.Trait.RadarSignatureColor(t.Actor);
-					foreach (var cell in t.Trait.RadarSignatureCells(t.Actor))
-					{
-						var uv = cell.ToMPos(map);
-						if (b.Contains(uv.U, uv.V))
-							colors[(uv.V - b.Top) * stride + uv.U - b.Left] = color.ToArgb();
-					}
-				}
-			}
-
-			bitmap.UnlockBits(bitmapData);
-			return bitmap;
-		}
-
-		public static Bitmap ShroudBitmap(World world)
-		{
-			var map = world.Map;
-			var b = map.Bounds;
-
-			var size = Exts.NextPowerOf2(Math.Max(b.Width, b.Height));
-			var bitmap = new Bitmap(size, size);
-			if (world.RenderPlayer == null)
-				return bitmap;
-
-			var bitmapData = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-			var shroud = Color.Black.ToArgb();
-			var fog = Color.FromArgb(128, Color.Black).ToArgb();
-
-			unsafe
-			{
-				var colors = (int*)bitmapData.Scan0;
-				var stride = bitmapData.Stride / 4;
-				var shroudObscured = world.ShroudObscuresTest(map.Cells);
-				var fogObscured = world.FogObscuresTest(map.Cells);
-				foreach (var uv in map.Cells.MapCoords)
-				{
-					var bitmapXy = new int2(uv.U - b.Left, uv.V - b.Top);
-					if (shroudObscured(uv))
-						colors[bitmapXy.Y * stride + bitmapXy.X] = shroud;
-					else if (fogObscured(uv))
-						colors[bitmapXy.Y * stride + bitmapXy.X] = fog;
-				}
-			}
-
-			bitmap.UnlockBits(bitmapData);
-			return bitmap;
-		}
-
 		public static Bitmap RenderMapPreview(TileSet tileset, Map map, bool actualSize)
 		{
 			return RenderMapPreview(tileset, map, map.Rules, actualSize);
--- a/OpenRA.Game/Graphics/PaletteReference.cs
+++ b/OpenRA.Game/Graphics/PaletteReference.cs
@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Graphics
+{
+	public sealed class PaletteReference
+	{
+		readonly float index;
+		readonly HardwarePalette hardwarePalette;
+
+		public readonly string Name;
+		public IPalette Palette { get; internal set; }
+		public float TextureIndex { get { return index / hardwarePalette.Height; } }
+		public float TextureMidIndex { get { return (index + 0.5f) / hardwarePalette.Height; } }
+
+		public PaletteReference(string name, int index, IPalette palette, HardwarePalette hardwarePalette)
+		{
+			Name = name;
+			Palette = palette;
+			this.index = index;
+			this.hardwarePalette = hardwarePalette;
+		}
+	}
+}
--- a/OpenRA.Game/Graphics/PlayerColorRemap.cs
+++ b/OpenRA.Game/Graphics/PlayerColorRemap.cs
@@ -33,16 +33,17 @@ namespace OpenRA.Graphics
 			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);
+			var rampMaxIndex = ramp.Length - 1;

 			// reversed remapping
-			if (ramp[0] > ramp[15])
+			if (ramp[0] > ramp[rampMaxIndex])
 			{
-				baseIndex = ramp[15];
-				for (var i = 15; i > 0; i--)
-					remapRamp = ramp.Select(r => r - ramp[15]);
+				baseIndex = ramp[rampMaxIndex];
+				for (var i = rampMaxIndex; i > 0; i--)
+					remapRamp = ramp.Select(r => r - ramp[rampMaxIndex]);
 			}

-			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))
+			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / (float)ramp.Length, c1, c2)))
 				.ToDictionary(u => u.First, u => u.Second);
 		}

--- a/OpenRA.Game/Graphics/QuadRenderer.cs
+++ b/OpenRA.Game/Graphics/QuadRenderer.cs
@@ -8,6 +8,7 @@
 */
 #endregion

+using System;
 using System.Drawing;

 namespace OpenRA.Graphics
@@ -16,6 +17,7 @@ namespace OpenRA.Graphics
 	{
 		readonly Renderer renderer;
 		readonly IShader shader;
+		readonly Action renderAction;

 		readonly Vertex[] vertices;
 		int nv = 0;
@@ -25,6 +27,7 @@ namespace OpenRA.Graphics
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
+			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.QuadList);
 		}

 		public void Flush()
@@ -32,12 +35,7 @@ namespace OpenRA.Graphics
 			if (nv > 0)
 			{
 				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(() =>
-				{
-					var vb = renderer.GetTempVertexBuffer();
-					vb.SetData(vertices, nv);
-					renderer.DrawBatch(vb, 0, nv, PrimitiveType.QuadList);
-				});
+				shader.Render(renderAction);
 				renderer.Device.SetBlendMode(BlendMode.None);

 				nv = 0;
@@ -51,6 +49,7 @@ namespace OpenRA.Graphics
 			if (nv + 4 > renderer.TempBufferSize)
 				Flush();

+			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
 			var b = color.B / 255.0f;
--- a/OpenRA.Game/Graphics/SelectionBarsRenderable.cs
+++ b/OpenRA.Game/Graphics/SelectionBarsRenderable.cs
@@ -65,30 +65,46 @@ namespace OpenRA.Graphics

 			var z = float2.Lerp(start, end, value);
 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c, c);
-			wlr.DrawLine(start + q, end + q, c2, c2);
-			wlr.DrawLine(start + r, end + r, c, c);
+			wlr.DrawLine(start + p, end + p, c);
+			wlr.DrawLine(start + q, end + q, c2);
+			wlr.DrawLine(start + r, end + r, c);

-			wlr.DrawLine(start + p, z + p, barColor2, barColor2);
-			wlr.DrawLine(start + q, z + q, barColor, barColor);
-			wlr.DrawLine(start + r, z + r, barColor2, barColor2);
+			wlr.DrawLine(start + p, z + p, barColor2);
+			wlr.DrawLine(start + q, z + q, barColor);
+			wlr.DrawLine(start + r, z + r, barColor2);
 		}

-		Color GetHealthColor(Health health)
+		Color GetHealthColor(IHealth health)
 		{
-			if (Game.Settings.Game.TeamHealthColors)
+			var player = actor.World.RenderPlayer ?? actor.World.LocalPlayer;
+
+			if (Game.Settings.Game.TeamHealthColors && player != null && !player.Spectating)
 			{
-				var isAlly = actor.Owner.IsAlliedWith(actor.World.LocalPlayer)
-					|| (actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
-					&& actor.World.LocalPlayer.IsAlliedWith(actor.EffectiveOwner.Owner));
-				return isAlly ? Color.LimeGreen : actor.Owner.NonCombatant ? Color.Tan : Color.Red;
+				var apparentOwner = actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
+					? actor.EffectiveOwner.Owner
+					: actor.Owner;
+
+				// For friendly spies, treat the unit's owner as the actual owner
+				if (actor.Owner.IsAlliedWith(actor.World.RenderPlayer))
+					apparentOwner = actor.Owner;
+
+				if (apparentOwner == player)
+					return Color.LimeGreen;
+
+				if (apparentOwner.IsAlliedWith(player))
+					return Color.Yellow;
+
+				if (apparentOwner.NonCombatant)
+					return Color.Tan;
+
+				return Color.Red;
 			}
 			else
 				return health.DamageState == DamageState.Critical ? Color.Red :
 					health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;
 		}

-		void DrawHealthBar(WorldRenderer wr, Health health, float2 start, float2 end)
+		void DrawHealthBar(WorldRenderer wr, IHealth health, float2 start, float2 end)
 		{
 			if (health == null || health.IsDead)
 				return;
@@ -109,15 +125,15 @@ namespace OpenRA.Graphics
 			var z = float2.Lerp(start, end, (float)health.HP / health.MaxHP);

 			var wlr = Game.Renderer.WorldLineRenderer;
-			wlr.DrawLine(start + p, end + p, c, c);
-			wlr.DrawLine(start + q, end + q, c2, c2);
-			wlr.DrawLine(start + r, end + r, c, c);
+			wlr.DrawLine(start + p, end + p, c);
+			wlr.DrawLine(start + q, end + q, c2);
+			wlr.DrawLine(start + r, end + r, c);

-			wlr.DrawLine(start + p, z + p, healthColor2, healthColor2);
-			wlr.DrawLine(start + q, z + q, healthColor, healthColor);
-			wlr.DrawLine(start + r, z + r, healthColor2, healthColor2);
+			wlr.DrawLine(start + p, z + p, healthColor2);
+			wlr.DrawLine(start + q, z + q, healthColor);
+			wlr.DrawLine(start + r, z + r, healthColor2);

-			if (health.DisplayHp != health.HP)
+			if (health.DisplayHP != health.HP)
 			{
 				var deltaColor = Color.OrangeRed;
 				var deltaColor2 = Color.FromArgb(
@@ -125,11 +141,11 @@ namespace OpenRA.Graphics
 					deltaColor.R / 2,
 					deltaColor.G / 2,
 					deltaColor.B / 2);
-				var zz = float2.Lerp(start, end, (float)health.DisplayHp / health.MaxHP);
+				var zz = float2.Lerp(start, end, (float)health.DisplayHP / health.MaxHP);

-				wlr.DrawLine(z + p, zz + p, deltaColor2, deltaColor2);
-				wlr.DrawLine(z + q, zz + q, deltaColor, deltaColor);
-				wlr.DrawLine(z + r, zz + r, deltaColor2, deltaColor2);
+				wlr.DrawLine(z + p, zz + p, deltaColor2);
+				wlr.DrawLine(z + q, zz + q, deltaColor);
+				wlr.DrawLine(z + r, zz + r, deltaColor2);
 			}
 		}

@@ -139,10 +155,10 @@ namespace OpenRA.Graphics
 			if (!actor.IsInWorld || actor.IsDead)
 				return;

-			var health = actor.TraitOrDefault<Health>();
+			var health = actor.TraitOrDefault<IHealth>();

 			var screenPos = wr.ScreenPxPosition(pos);
-			var bounds = actor.Bounds;
+			var bounds = actor.VisualBounds;
 			bounds.Offset(screenPos.X, screenPos.Y);

 			var start = new float2(bounds.Left + 1, bounds.Top);
--- a/OpenRA.Game/Graphics/SequenceProvider.cs
+++ b/OpenRA.Game/Graphics/SequenceProvider.cs
@@ -120,7 +120,7 @@ namespace OpenRA.Graphics
 		public Sequences LoadSequences(Map map)
 		{
 			using (new Support.PerfTimer("LoadSequences"))
-				return Load(map.SequenceDefinitions);
+				return Load(map != null ? map.SequenceDefinitions : new List<MiniYamlNode>());
 		}

 		Sequences Load(List<MiniYamlNode> sequenceNodes)
--- a/OpenRA.Game/Graphics/Sheet.cs
+++ b/OpenRA.Game/Graphics/Sheet.cs
@@ -18,13 +18,14 @@ namespace OpenRA.Graphics
 {
 	public sealed class Sheet : IDisposable
 	{
-		readonly object textureLock = new object();
 		bool dirty;
 		bool releaseBufferOnCommit;
 		ITexture texture;
 		byte[] data;

 		public readonly Size Size;
+		public readonly SheetType Type;
+
 		public byte[] GetData()
 		{
 			CreateBuffer();
@@ -33,66 +34,51 @@ namespace OpenRA.Graphics

 		public bool Buffered { get { return data != null || texture == null; } }

-		public Sheet(Size size)
+		public Sheet(SheetType type, Size size)
 		{
+			Type = type;
 			Size = size;
 		}

-		public Sheet(ITexture texture)
+		public Sheet(SheetType type, ITexture texture)
 		{
+			Type = type;
 			this.texture = texture;
 			Size = texture.Size;
 		}

-		public Sheet(string filename)
+		public Sheet(SheetType type, string filename)
 		{
 			using (var stream = GlobalFileSystem.Open(filename))
 			using (var bitmap = (Bitmap)Image.FromStream(stream))
 			{
 				Size = bitmap.Size;
+				data = new byte[4 * Size.Width * Size.Height];

-				var dataStride = 4 * Size.Width;
-				data = new byte[dataStride * Size.Height];
-
-				var bd = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-				for (var y = 0; y < Size.Height; y++)
-					Marshal.Copy(IntPtr.Add(bd.Scan0, y * bd.Stride), data, y * dataStride, dataStride);
-				bitmap.UnlockBits(bd);
+				Util.FastCopyIntoSprite(new Sprite(this, bitmap.Bounds(), TextureChannel.Red), bitmap);
 			}

+			Type = type;
 			ReleaseBuffer();
 		}

 		public ITexture GetTexture()
 		{
-			// This is only called from the main thread but 'dirty'
-			// is set from other threads too via CommitData().
-			GenerateTexture();
-			return texture;
-		}
-
-		void GenerateTexture()
-		{
-			lock (textureLock)
+			if (texture == null)
 			{
-				if (texture == null)
-				{
-					texture = Game.Renderer.Device.CreateTexture();
-					dirty = true;
-				}
-
-				if (data != null)
-				{
-					if (dirty)
-					{
-						texture.SetData(data, Size.Width, Size.Height);
-						dirty = false;
-						if (releaseBufferOnCommit)
-							data = null;
-					}
-				}
+				texture = Game.Renderer.Device.CreateTexture();
+				dirty = true;
 			}
+
+			if (data != null && dirty)
+			{
+				texture.SetData(data, Size.Width, Size.Height);
+				dirty = false;
+				if (releaseBufferOnCommit)
+					data = null;
+			}
+
+			return texture;
 		}

 		public Bitmap AsBitmap()
@@ -141,42 +127,32 @@ namespace OpenRA.Graphics

 		public void CreateBuffer()
 		{
-			lock (textureLock)
-			{
-				if (data != null)
-					return;
-				if (texture == null)
-					data = new byte[4 * Size.Width * Size.Height];
-				else
-					data = texture.GetData();
-				releaseBufferOnCommit = false;
-			}
+			if (data != null)
+				return;
+			if (texture == null)
+				data = new byte[4 * Size.Width * Size.Height];
+			else
+				data = texture.GetData();
+			releaseBufferOnCommit = false;
 		}

-		public void CommitData()
+		public void CommitBufferedData()
 		{
-			CommitData(false);
+			if (!Buffered)
+				throw new InvalidOperationException(
+					"This sheet is unbuffered. You cannot call CommitBufferedData on an unbuffered sheet. " +
+					"If you need to completely replace the texture data you should set data into the texture directly. " +
+					"If you need to make only small changes to the texture data consider creating a buffered sheet instead.");
+
+			dirty = true;
 		}

 		public void ReleaseBuffer()
 		{
-			CommitData(true);
-		}
-
-		void CommitData(bool releaseBuffer)
-		{
-			lock (textureLock)
-			{
-				if (!Buffered)
-					throw new InvalidOperationException(
-						"This sheet is unbuffered. You cannot call CommitData on an unbuffered sheet. " +
-						"If you need to completely replace the texture data you should set data into the texture directly. " +
-						"If you need to make only small changes to the texture data consider creating a buffered sheet instead.");
-
-				dirty = true;
-				if (releaseBuffer)
-					releaseBufferOnCommit = true;
-			}
+			if (!Buffered)
+				return;
+			dirty = true;
+			releaseBufferOnCommit = true;
 		}

 		public void Dispose()
--- a/OpenRA.Game/Graphics/SheetBuilder.cs
+++ b/OpenRA.Game/Graphics/SheetBuilder.cs
@@ -40,16 +40,16 @@ namespace OpenRA.Graphics
 		int rowHeight = 0;
 		Point p;

-		public static Sheet AllocateSheet(int sheetSize)
+		public static Sheet AllocateSheet(SheetType type, int sheetSize)
 		{
-			return new Sheet(new Size(sheetSize, sheetSize));
+			return new Sheet(type, new Size(sheetSize, sheetSize));
 		}

 		public SheetBuilder(SheetType t)
 			: this(t, Game.Settings.Graphics.SheetSize) { }

 		public SheetBuilder(SheetType t, int sheetSize)
-			: this(t, () => AllocateSheet(sheetSize)) { }
+			: this(t, () => AllocateSheet(t, sheetSize)) { }

 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{
@@ -70,7 +70,7 @@ namespace OpenRA.Graphics

 			var rect = Allocate(size, spriteOffset);
 			Util.FastCopyIntoChannel(rect, src);
-			current.CommitData();
+			current.CommitBufferedData();
 			return rect;
 		}

@@ -78,7 +78,7 @@ namespace OpenRA.Graphics
 		{
 			var rect = Allocate(src.Size);
 			Util.FastCopyIntoSprite(rect, src);
-			current.CommitData();
+			current.CommitBufferedData();
 			return rect;
 		}

--- a/OpenRA.Game/Graphics/Sprite.cs
+++ b/OpenRA.Game/Graphics/Sprite.cs
@@ -8,6 +8,7 @@
 */
 #endregion

+using System;
 using System.Drawing;

 namespace OpenRA.Graphics
@@ -24,12 +25,9 @@ namespace OpenRA.Graphics
 		public readonly float Top, Left, Bottom, Right;

 		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel)
-			: this(sheet, bounds, float2.Zero, channel, BlendMode.Alpha) { }
+			: this(sheet, bounds, float2.Zero, channel) { }

-		public Sprite(Sheet sheet, Rectangle bounds, TextureChannel channel, BlendMode blendMode)
-			: this(sheet, bounds, float2.Zero, channel, blendMode) { }
-
-		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode)
+		public Sprite(Sheet sheet, Rectangle bounds, float2 offset, TextureChannel channel, BlendMode blendMode = BlendMode.Alpha)
 		{
 			Sheet = sheet;
 			Bounds = bounds;
@@ -40,10 +38,10 @@ namespace OpenRA.Graphics

 			FractionalOffset = offset / Size;

-			Left = (float)bounds.Left / sheet.Size.Width;
-			Top = (float)bounds.Top / sheet.Size.Height;
-			Right = (float)bounds.Right / sheet.Size.Width;
-			Bottom = (float)bounds.Bottom / sheet.Size.Height;
+			Left = (float)Math.Min(bounds.Left, bounds.Right) / sheet.Size.Width;
+			Top = (float)Math.Min(bounds.Top, bounds.Bottom) / sheet.Size.Height;
+			Right = (float)Math.Max(bounds.Left, bounds.Right) / sheet.Size.Width;
+			Bottom = (float)Math.Max(bounds.Top, bounds.Bottom) / sheet.Size.Height;
 		}
 	}

--- a/OpenRA.Game/Graphics/SpriteFont.cs
+++ b/OpenRA.Game/Graphics/SpriteFont.cs
@@ -93,6 +93,9 @@ namespace OpenRA.Graphics

 		public int2 Measure(string text)
 		{
+			if (string.IsNullOrEmpty(text))
+				return new int2(0, size);
+
 			var lines = text.Split('\n');
 			return new int2((int)Math.Ceiling(lines.Max(lineWidth)), lines.Length * size);
 		}
@@ -102,18 +105,19 @@ namespace OpenRA.Graphics
 			face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
 			face.Glyph.RenderGlyph(RenderMode.Normal);

-			var size = new Size((int)face.Glyph.Metrics.Width >> 6, (int)face.Glyph.Metrics.Height >> 6);
+			var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
 			var s = builder.Allocate(size);

 			var g = new GlyphInfo
 			{
 				Sprite = s,
-				Advance = (int)face.Glyph.Metrics.HorizontalAdvance / 64f,
+				Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
 				Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
 			};

 			// A new bitmap is generated each time this property is accessed, so we do need to dispose it.
 			using (var bitmap = face.Glyph.Bitmap)
+			{
 				unsafe
 				{
 					var p = (byte*)bitmap.Buffer;
@@ -123,20 +127,25 @@ namespace OpenRA.Graphics
 					for (var j = 0; j < s.Size.Y; j++)
 					{
 						for (var i = 0; i < s.Size.X; i++)
+						{
 							if (p[i] != 0)
 							{
 								var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
-								dest[q] = c.Second.B;
-								dest[q + 1] = c.Second.G;
-								dest[q + 2] = c.Second.R;
-								dest[q + 3] = p[i];
+								var pmc = Util.PremultiplyAlpha(Color.FromArgb(p[i], c.Second));
+
+								dest[q] = pmc.B;
+								dest[q + 1] = pmc.G;
+								dest[q + 2] = pmc.R;
+								dest[q + 3] = pmc.A;
 							}
+						}

 						p += bitmap.Pitch;
 					}
 				}
+			}

-			s.Sheet.CommitData();
+			s.Sheet.CommitBufferedData();

 			return g;
 		}
--- a/OpenRA.Game/Graphics/SpriteRenderer.cs
+++ b/OpenRA.Game/Graphics/SpriteRenderer.cs
@@ -17,6 +17,7 @@ namespace OpenRA.Graphics
 	{
 		readonly Renderer renderer;
 		readonly IShader shader;
+		readonly Action renderAction;

 		readonly Vertex[] vertices;
 		Sheet currentSheet;
@@ -28,6 +29,7 @@ namespace OpenRA.Graphics
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
+			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.QuadList);
 		}

 		public void Flush()
@@ -37,12 +39,7 @@ namespace OpenRA.Graphics
 				shader.SetTexture("DiffuseTexture", currentSheet.GetTexture());

 				renderer.Device.SetBlendMode(currentBlend);
-				shader.Render(() =>
-				{
-					var vb = renderer.GetTempVertexBuffer();
-					vb.SetData(vertices, nv);
-					renderer.DrawBatch(vb, 0, nv, PrimitiveType.QuadList);
-				});
+				shader.Render(renderAction);
 				renderer.Device.SetBlendMode(BlendMode.None);

 				nv = 0;
@@ -54,7 +51,7 @@ namespace OpenRA.Graphics
 		{
 			renderer.CurrentBatchRenderer = this;

-			if (s.Sheet != currentSheet || s.BlendMode != currentBlend || nv + 4 > renderer.TempBufferSize)
+			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 4 > renderer.TempBufferSize)
 				Flush();

 			currentBlend = s.BlendMode;
@@ -103,10 +100,10 @@ namespace OpenRA.Graphics
 			nv += 4;
 		}

-		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet)
+		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
 		{
 			shader.SetTexture("DiffuseTexture", sheet.GetTexture());
-			renderer.Device.SetBlendMode(BlendMode.Alpha);
+			renderer.Device.SetBlendMode(blendMode);
 			shader.Render(() => renderer.DrawBatch(buffer, start, length, type));
 			renderer.Device.SetBlendMode(BlendMode.None);
 		}
@@ -122,5 +119,10 @@ namespace OpenRA.Graphics
 			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
 			shader.SetVec("r2", -1, 1);
 		}
+
+		public void SetDepthPreviewEnabled(bool enabled)
+		{
+			shader.SetBool("EnableDepthPreview", enabled);
+		}
 	}
 }
--- a/OpenRA.Game/Graphics/TargetLineRenderable.cs
+++ b/OpenRA.Game/Graphics/TargetLineRenderable.cs
@@ -47,7 +47,7 @@ namespace OpenRA.Graphics
 			var a = first;
 			foreach (var b in waypoints.Skip(1).Select(pos => wr.ScreenPxPosition(pos)))
 			{
-				Game.Renderer.WorldLineRenderer.DrawLine(a, b, color, color);
+				Game.Renderer.WorldLineRenderer.DrawLine(a, b, color);
 				wr.DrawTargetMarker(color, b);
 				a = b;
 			}
--- a/OpenRA.Game/Graphics/TerrainRenderer.cs
+++ b/OpenRA.Game/Graphics/TerrainRenderer.cs
@@ -15,52 +15,44 @@ namespace OpenRA.Graphics
 {
 	sealed class TerrainRenderer : IDisposable
 	{
-		readonly IVertexBuffer<Vertex> vertexBuffer;
-		readonly World world;
-		readonly Map map;
+		readonly TerrainSpriteLayer terrain;
+		readonly Theater theater;
+		readonly CellLayer<TerrainTile> mapTiles;
+		readonly CellLayer<byte> mapHeight;

 		public TerrainRenderer(World world, WorldRenderer wr)
 		{
-			this.world = world;
-			this.map = world.Map;
+			theater = wr.Theater;
+			mapTiles = world.Map.MapTiles.Value;
+			mapHeight = world.Map.MapHeight.Value;

-			var terrainPalette = wr.Palette("terrain").TextureIndex;
-			var vertices = new Vertex[4 * map.Bounds.Height * map.Bounds.Width];
-			var nv = 0;
+			terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha,
+				wr.Palette("terrain"), wr.World.Type != WorldType.Editor);

-			foreach (var cell in map.Cells)
-			{
-				var tile = wr.Theater.TileSprite(map.MapTiles.Value[cell]);
-				var pos = wr.ScreenPosition(map.CenterOfCell(cell)) + tile.Offset - 0.5f * tile.Size;
-				Util.FastCreateQuad(vertices, pos, tile, terrainPalette, nv, tile.Size);
-				nv += 4;
-			}
+			foreach (var cell in world.Map.AllCells)
+				UpdateCell(cell);

-			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
-			vertexBuffer.SetData(vertices, nv);
+			mapTiles.CellEntryChanged += UpdateCell;
+			mapHeight.CellEntryChanged += UpdateCell;
+		}
+
+		public void UpdateCell(CPos cell)
+		{
+			terrain.Update(cell, theater.TileSprite(mapTiles[cell]));
 		}

 		public void Draw(WorldRenderer wr, Viewport viewport)
 		{
-			var verticesPerRow = 4 * map.Bounds.Width;
-			var cells = viewport.VisibleCells;
-
-			// Only draw the rows that are visible.
-			// VisibleCells is clamped to the map, so additional checks are unnecessary
-			var firstRow = cells.TopLeft.ToMPos(map).V - map.Bounds.Top;
-			var lastRow = cells.BottomRight.ToMPos(map).V - map.Bounds.Top + 1;
-
-			Game.Renderer.WorldSpriteRenderer.DrawVertexBuffer(
-				vertexBuffer, verticesPerRow * firstRow, verticesPerRow * (lastRow - firstRow),
-				PrimitiveType.QuadList, wr.Theater.Sheet);
-
-			foreach (var r in world.WorldActor.TraitsImplementing<IRenderOverlay>())
+			terrain.Draw(viewport);
+			foreach (var r in wr.World.WorldActor.TraitsImplementing<IRenderOverlay>())
 				r.Render(wr);
 		}

 		public void Dispose()
 		{
-			vertexBuffer.Dispose();
+			mapTiles.CellEntryChanged -= UpdateCell;
+			mapHeight.CellEntryChanged -= UpdateCell;
+			terrain.Dispose();
 		}
 	}
 }
--- a/OpenRA.Game/Graphics/TerrainSpriteLayer.cs
+++ b/OpenRA.Game/Graphics/TerrainSpriteLayer.cs
@@ -0,0 +1,137 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Graphics
+{
+	public sealed class TerrainSpriteLayer : IDisposable
+	{
+		public readonly Sheet Sheet;
+		public readonly BlendMode BlendMode;
+
+		readonly Sprite emptySprite;
+
+		readonly IVertexBuffer<Vertex> vertexBuffer;
+		readonly Vertex[] vertices;
+		readonly HashSet<int> dirtyRows = new HashSet<int>();
+		readonly int rowStride;
+		readonly bool restrictToBounds;
+
+		readonly WorldRenderer worldRenderer;
+		readonly Map map;
+
+		readonly PaletteReference palette;
+
+		public TerrainSpriteLayer(World world, WorldRenderer wr, Sheet sheet, BlendMode blendMode, PaletteReference palette, bool restrictToBounds)
+		{
+			worldRenderer = wr;
+			this.restrictToBounds = restrictToBounds;
+			Sheet = sheet;
+			BlendMode = blendMode;
+			this.palette = palette;
+
+			map = world.Map;
+			rowStride = 4 * map.MapSize.X;
+
+			vertices = new Vertex[rowStride * map.MapSize.Y];
+			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
+			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
+
+			wr.PaletteInvalidated += UpdatePaletteIndices;
+		}
+
+		void UpdatePaletteIndices()
+		{
+			// Everything in the layer uses the same palette,
+			// so we can fix the indices in one pass
+			for (var i = 0; i < vertices.Length; i++)
+			{
+				var v = vertices[i];
+				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.U, v.V, palette.TextureIndex, v.C);
+			}
+
+			for (var row = 0; row < map.MapSize.Y; row++)
+				dirtyRows.Add(row);
+		}
+
+		public void Update(CPos cell, Sprite sprite)
+		{
+			var pos = sprite == null ? float2.Zero :
+				worldRenderer.ScreenPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
+			Update(cell.ToMPos(map.Grid.Type), sprite, pos);
+		}
+
+		public void Update(MPos uv, Sprite sprite, float2 pos)
+		{
+			if (sprite != null)
+			{
+				if (sprite.Sheet != Sheet)
+					throw new InvalidDataException("Attempted to add sprite from a different sheet");
+
+				if (sprite.BlendMode != BlendMode)
+					throw new InvalidDataException("Attempted to add sprite with a different blend mode");
+			}
+			else
+				sprite = emptySprite;
+
+			var offset = rowStride * uv.V + 4 * uv.U;
+			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
+
+			dirtyRows.Add(uv.V);
+		}
+
+		public void Draw(Viewport viewport)
+		{
+			var cells = restrictToBounds ? viewport.VisibleCellsInsideBounds : viewport.AllVisibleCells;
+
+			// Only draw the rows that are visible.
+			var firstRow = cells.CandidateMapCoords.TopLeft.V.Clamp(0, map.MapSize.Y);
+			var lastRow = (cells.CandidateMapCoords.BottomRight.V + 1).Clamp(firstRow, map.MapSize.Y);
+
+			Game.Renderer.Flush();
+
+			// Flush any visible changes to the GPU
+			for (var row = firstRow; row <= lastRow; row++)
+			{
+				if (!dirtyRows.Remove(row))
+					continue;
+
+				var rowOffset = rowStride * row;
+
+				unsafe
+				{
+					// The compiler / language spec won't let us calculate a pointer to
+					// an offset inside a generic array T[], and so we are forced to
+					// calculate the start-of-row pointer here to pass in to SetData.
+					fixed (Vertex* vPtr = &vertices[0])
+						vertexBuffer.SetData((IntPtr)(vPtr + rowOffset), rowOffset, rowStride);
+				}
+			}
+
+			Game.Renderer.WorldSpriteRenderer.DrawVertexBuffer(
+				vertexBuffer, rowStride * firstRow, rowStride * (lastRow - firstRow),
+				PrimitiveType.QuadList, Sheet, BlendMode);
+
+			Game.Renderer.Flush();
+		}
+
+		public void Dispose()
+		{
+			worldRenderer.PaletteInvalidated -= UpdatePaletteIndices;
+			vertexBuffer.Dispose();
+		}
+	}
+}
--- a/OpenRA.Game/Graphics/Theater.cs
+++ b/OpenRA.Game/Graphics/Theater.cs
@@ -43,16 +43,18 @@ namespace OpenRA.Graphics
 		{
 			this.tileset = tileset;
 			var allocated = false;
+			var type = tileset.EnableDepth ? SheetType.DualIndexed : SheetType.Indexed;
+
 			Func<Sheet> allocate = () =>
 			{
 				if (allocated)
 					throw new SheetOverflowException("Terrain sheet overflow. Try increasing the tileset SheetSize parameter.");
 				allocated = true;

-				return new Sheet(new Size(tileset.SheetSize, tileset.SheetSize));
+				return new Sheet(type, new Size(tileset.SheetSize, tileset.SheetSize));
 			};

-			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
+			sheetBuilder = new SheetBuilder(type, allocate);
 			random = new MersenneTwister();

 			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
@@ -63,8 +65,19 @@ namespace OpenRA.Graphics
 				foreach (var i in t.Value.Images)
 				{
 					var allFrames = frameCache[i];
-					var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
-					variants.Add(frames.Select(f => sheetBuilder.Add(f)).ToArray());
+					var frameCount = tileset.EnableDepth ? allFrames.Length / 2 : allFrames.Length;
+					var indices = t.Value.Frames != null ? t.Value.Frames : Enumerable.Range(0, frameCount);
+					variants.Add(indices.Select(j =>
+					{
+						var f = allFrames[j];
+						var s = sheetBuilder.Allocate(f.Size, f.Offset);
+						Util.FastCopyIntoChannel(s, 0, f.Data);
+
+						if (tileset.EnableDepth)
+							Util.FastCopyIntoChannel(s, 1, allFrames[j + frameCount].Data);
+
+						return s;
+					}).ToArray());
 				}

 				var allSprites = variants.SelectMany(s => s);
@@ -82,7 +95,7 @@ namespace OpenRA.Graphics
 			Sheet.ReleaseBuffer();
 		}

-		public Sprite TileSprite(TerrainTile r)
+		public Sprite TileSprite(TerrainTile r, int? variant = null)
 		{
 			TheaterTemplate template;
 			if (!templates.TryGetValue(r.Type, out template))
@@ -91,11 +104,11 @@ namespace OpenRA.Graphics
 			if (r.Index >= template.Stride)
 				return missingTile;

-			var start = template.Variants > 1 ? random.Next(template.Variants) : 0;
+			var start = template.Variants > 1 ? variant.HasValue ? variant.Value : random.Next(template.Variants) : 0;
 			return template.Sprites[start * template.Stride + r.Index];
 		}

-		public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, TileShape tileShape)
+		public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, MapGridType mapGrid)
 		{
 			Rectangle? templateRect = null;

@@ -112,8 +125,8 @@ namespace OpenRA.Graphics
 						continue;

 					var sprite = TileSprite(tile);
-					var u = tileShape == TileShape.Rectangle ? x : (x - y) / 2f;
-					var v = tileShape == TileShape.Rectangle ? y : (x + y) / 2f;
+					var u = mapGrid == MapGridType.Rectangular ? x : (x - y) / 2f;
+					var v = mapGrid == MapGridType.Rectangular ? y : (x + y) / 2f;

 					var tl = new float2(u * tileSize.Width, (v - 0.5f * tileInfo.Height) * tileSize.Height) - 0.5f * sprite.Size;
 					var rect = new Rectangle((int)(tl.X + sprite.Offset.X), (int)(tl.Y + sprite.Offset.Y), (int)sprite.Size.X, (int)sprite.Size.Y);
--- a/OpenRA.Game/Graphics/Util.cs
+++ b/OpenRA.Game/Graphics/Util.cs
@@ -19,7 +19,7 @@ namespace OpenRA.Graphics
 	{
 		// yes, our channel order is nuts.
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
-		static readonly float[] ChannelSelect = { 0.75f, 0.25f, -0.25f, -0.75f };
+		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };

 		public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, float paletteTextureIndex, int nv, float2 size)
 		{
@@ -32,6 +32,8 @@ namespace OpenRA.Graphics
 		public static void FastCreateQuad(Vertex[] vertices, float2 a, float2 b, float2 c, float2 d, Sprite r, float paletteTextureIndex, int nv)
 		{
 			var attribC = ChannelSelect[(int)r.Channel];
+			if (r.Sheet.Type == SheetType.DualIndexed)
+				attribC *= -1;

 			vertices[nv] = new Vertex(a, r.Left, r.Top, paletteTextureIndex, attribC);
 			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, paletteTextureIndex, attribC);
@@ -73,18 +75,37 @@ namespace OpenRA.Graphics

 			try
 			{
-				var data = dest.Sheet.GetData();
-				var dataStride = dest.Sheet.Size.Width * 4;
-				var x = dest.Bounds.Left * 4;
-				var width = dest.Bounds.Width * 4;
-				var y = dest.Bounds.Top;
+				var destData = dest.Sheet.GetData();
+				var destStride = dest.Sheet.Size.Width;
+				var width = dest.Bounds.Width;
 				var height = dest.Bounds.Height;

-				var bd = src.LockBits(src.Bounds(),
-					ImageLockMode.ReadWrite, src.PixelFormat);
-				for (var row = 0; row < height; row++)
-					Marshal.Copy(IntPtr.Add(bd.Scan0, row * bd.Stride), data, (y + row) * dataStride + x, width);
-				src.UnlockBits(bd);
+				var srcData = src.LockBits(src.Bounds(),
+					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					var c = (int*)srcData.Scan0;
+
+					// Cast the data to an int array so we can copy the src data directly
+					fixed (byte* bd = &destData[0])
+					{
+						var data = (int*)bd;
+						var x = dest.Bounds.Left;
+						var y = dest.Bounds.Top;
+
+						for (var j = 0; j < height; j++)
+						{
+							for (var i = 0; i < width; i++)
+							{
+								var cc = Color.FromArgb(*(c + (j * srcData.Stride >> 2) + i));
+								data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
+							}
+						}
+					}
+				}
+
+				src.UnlockBits(srcData);
 			}
 			finally
 			{
@@ -93,6 +114,26 @@ namespace OpenRA.Graphics
 			}
 		}

+		public static Color PremultiplyAlpha(Color c)
+		{
+			if (c.A == byte.MaxValue)
+				return c;
+			var a = c.A / 255f;
+			return Color.FromArgb(c.A, (byte)(c.R * a + 0.5f), (byte)(c.G * a + 0.5f), (byte)(c.B * a + 0.5f));
+		}
+
+		public static Color PremultipliedColorLerp(float t, Color c1, Color c2)
+		{
+			// Colors must be lerped in a non-multiplied color space
+			var a1 = 255f / c1.A;
+			var a2 = 255f / c2.A;
+			return PremultiplyAlpha(Color.FromArgb(
+				(int)(t * c2.A + (1 - t) * c1.A),
+				(int)((byte)(t * a2 * c2.R + 0.5f) + (1 - t) * (byte)(a1 * c1.R + 0.5f)),
+				(int)((byte)(t * a2 * c2.G + 0.5f) + (1 - t) * (byte)(a1 * c1.G + 0.5f)),
+				(int)((byte)(t * a2 * c2.B + 0.5f) + (1 - t) * (byte)(a1 * c1.B + 0.5f))));
+		}
+
 		public static float[] IdentityMatrix()
 		{
 			return Exts.MakeArray(16, j => (j % 5 == 0) ? 1.0f : 0);
--- a/OpenRA.Game/Graphics/Vertex.cs
+++ b/OpenRA.Game/Graphics/Vertex.cs
@@ -15,24 +15,19 @@ namespace OpenRA.Graphics
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
 	{
-		// TODO Workaround for unused field warnings in mono 2.10
-		#pragma warning disable 414
-		float x, y, z, u, v;
-		float p, c;
-		#pragma warning restore
+		public readonly float X, Y, Z, U, V, P, C;

 		public Vertex(float2 xy, float u, float v, float p, float c)
-		{
-			this.x = xy.X; this.y = xy.Y; this.z = 0;
-			this.u = u; this.v = v;
-			this.p = p; this.c = c;
-		}
+			: this(xy.X, xy.Y, 0, u, v, p, c) { }

 		public Vertex(float[] xyz, float u, float v, float p, float c)
+			: this(xyz[0], xyz[1], xyz[2], u, v, p, c) { }
+
+		public Vertex(float x, float y, float z, float u, float v, float p, float c)
 		{
-			this.x = xyz[0]; this.y = xyz[1]; this.z = xyz[2];
-			this.u = u; this.v = v;
-			this.p = p; this.c = c;
+			X = x; Y = y; Z = z;
+			U = u; V = v;
+			P = p; C = c;
 		}
 	}
 }
--- a/Show More
+++ b/Show More