diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index d3399689..af23a5da 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -1,6 +1,8 @@
-mse version: 0.3.5
+mse version: 0.3.6
+installer group: locales
 full name: English
 version: 2007-09-23
+icon: usgb.png
 
 ############################################################## Menu items
 menu:
@@ -92,13 +94,6 @@ menu:
 	basic shapes:		&Basic Shapes	F8
 	symmetry:			S&ymmetry	F9
 	paint:				P&aint	F10
-	
-	# Updates window
-	apply changes:		Apply changes
-	cancel changes:		Cancel changes
-	install package:	Install package
-	upgrade package:	Upgrade package
-	remove package:		Remove package
 
 ############################################################## Menu help texts
 help:
@@ -458,6 +453,23 @@ label:
 	
 	# Symbol editor
 	sides:				sides
+	
+	# Packages window
+	package name:				Package
+	package installed version:	Installed version
+	package remote version:		Latest version
+	package status:				Status
+	package action:				Action
+	
+	package conflicts:		conflicting modifications
+	package modified:		local modifications
+	package updates:		updates available
+	package installed:		installed
+	package installable:	not installed
+	install package:		install
+	upgrade package:		upgrade
+	remove package:			remove
+	
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -515,6 +527,15 @@ button:
 	defaults:			Reset to &Defaults
 	enabled:			Enabled
 	whole word:			Match whole word only
+	
+	# Packages window
+	install package:	&Install
+	upgrade package:	&Upgrade
+	remove package:		&Remove
+	install group:		&Install All
+	upgrade group:		&Upgrade All
+	remove group:		&Remove All
+	
 
 ############################################################## Titles in the GUI
 title:
@@ -639,9 +660,7 @@ error:
 	dependency not given:
 		The package '%s' uses files from the package '%s', but it does not list a dependency.
 		To resolve this, add:
-		depends on:
-			package: %s
-			version: %s
+		  depends on: %s %s
 	
 	# Script stuff
 	has no member:				%s has no member '%s'
@@ -687,6 +706,22 @@ error:
 	# Package update window
 	no packages:						Found no package updates.
 	checking updates:					Checking for updates.
+	can't download installer:
+		Unable to download installer for package %s from %s.
+		Nothing has been installed.
+	
+	downloading updates:				Downloading updates (%d of %d)
+	installing updates:					Updating packages (%d of %d)
+	
+	remove packages:
+		This will remove %s packages, do you want to continue?
+	remove packages modified:
+		This will remove %s packages, %s of those have been modified after installing.
+		Removing them can not be undone.
+		
+		Do you want to continue?
+	
+	cannot create file:		Can not create file '%s', continue installation?
 
 
 ############################################################## Types used in scripts / shape names
diff --git a/data/en.mse-locale/usgb.png b/data/en.mse-locale/usgb.png
new file mode 100644
index 00000000..196db587
Binary files /dev/null and b/data/en.mse-locale/usgb.png differ
diff --git a/src/data/action/keyword.cpp b/src/data/action/keyword.cpp
index 7917f487..8028d10e 100644
--- a/src/data/action/keyword.cpp
+++ b/src/data/action/keyword.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/action/keyword.hpp>
 #include <data/keyword.hpp>
 #include <data/set.hpp>
diff --git a/src/data/action/set.cpp b/src/data/action/set.cpp
index ef2c4d84..a4f0c7eb 100644
--- a/src/data/action/set.cpp
+++ b/src/data/action/set.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/action/set.hpp>
 #include <data/set.hpp>
 #include <data/card.hpp>
diff --git a/src/data/action/symbol.cpp b/src/data/action/symbol.cpp
index b610e628..0c959df7 100644
--- a/src/data/action/symbol.cpp
+++ b/src/data/action/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/action/symbol.hpp>
 #include <data/action/symbol_part.hpp>
 #include <util/error.hpp>
diff --git a/src/data/action/symbol_part.cpp b/src/data/action/symbol_part.cpp
index 70e7f4c3..f1629833 100644
--- a/src/data/action/symbol_part.cpp
+++ b/src/data/action/symbol_part.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/action/symbol_part.hpp>
 #include <gfx/bezier.hpp>
 
diff --git a/src/data/action/value.cpp b/src/data/action/value.cpp
index d5c1fdf3..8051ca7c 100644
--- a/src/data/action/value.cpp
+++ b/src/data/action/value.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/action/value.hpp>
 #include <data/field.hpp>
 #include <data/field/text.hpp>
diff --git a/src/data/card.cpp b/src/data/card.cpp
index 0eeec95a..df60ef45 100644
--- a/src/data/card.cpp
+++ b/src/data/card.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/card.hpp>
 #include <data/game.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/data/card.hpp b/src/data/card.hpp
index 02f4bd70..79070c9f 100644
--- a/src/data/card.hpp
+++ b/src/data/card.hpp
@@ -49,7 +49,7 @@ class Card : public IntrusivePtrVirtualBase {
 	/// Extra values for specitic stylesheets, indexed by stylesheet name
 	DelayedIndexMaps<FieldP,ValueP> extra_data;
 	/// Styling information for a particular stylesheet
-	IndexMap<FieldP, ValueP>& extraDataFor(const StyleSheet& stylesheet) ;
+	IndexMap<FieldP, ValueP>& extraDataFor(const StyleSheet& stylesheet);
 	
 	/// Keyword usage statistics
 	vector<pair<Value*,const Keyword*> > keyword_usage;
diff --git a/src/data/export_template.cpp b/src/data/export_template.cpp
index f38ac9ed..013e8c45 100644
--- a/src/data/export_template.cpp
+++ b/src/data/export_template.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/export_template.hpp>
 #include <data/game.hpp>
 #include <data/field.hpp>
diff --git a/src/data/field.cpp b/src/data/field.cpp
index ed98fb0e..03637fee 100644
--- a/src/data/field.cpp
+++ b/src/data/field.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field.hpp>
 #include <data/field/text.hpp>
 #include <data/field/choice.hpp>
diff --git a/src/data/field/boolean.cpp b/src/data/field/boolean.cpp
index aa77fcc3..53bd4ee3 100644
--- a/src/data/field/boolean.cpp
+++ b/src/data/field/boolean.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/boolean.hpp>
 
 // ----------------------------------------------------------------------------- : BooleanField
@@ -31,8 +32,8 @@ BooleanStyle::BooleanStyle(const ChoiceFieldP& field)
 	: ChoiceStyle(field)
 {
 	render_style = RENDER_BOTH;
-	//%%choice_images[_("yes")] = ScriptableImage(_("buildin_image(\"bool_yes\")"));
-	//%%choice_images[_("no")]  = ScriptableImage(_("buildin_image(\"bool_no\")"));
+	//choice_images[_("yes")] = ScriptableImage(_("buildin_image(\"bool_yes\")"));
+	//choice_images[_("no")]  = ScriptableImage(_("buildin_image(\"bool_no\")"));
 	choice_images[_("yes")] = ScriptableImage(new_intrusive1<BuiltInImage>(_("bool_yes")));
 	choice_images[_("no")]  = ScriptableImage(new_intrusive1<BuiltInImage>(_("bool_no")));
 }
diff --git a/src/data/field/choice.cpp b/src/data/field/choice.cpp
index a357d9bf..8e65fc83 100644
--- a/src/data/field/choice.cpp
+++ b/src/data/field/choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/choice.hpp>
 #include <util/io/package.hpp>
 #include <wx/imaglist.h>
diff --git a/src/data/field/color.cpp b/src/data/field/color.cpp
index cf8fd342..1333da81 100644
--- a/src/data/field/color.cpp
+++ b/src/data/field/color.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/color.hpp>
 #include <script/script.hpp>
 
diff --git a/src/data/field/image.cpp b/src/data/field/image.cpp
index 648faa99..611091c4 100644
--- a/src/data/field/image.cpp
+++ b/src/data/field/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/image.hpp>
 
 // ----------------------------------------------------------------------------- : ImageField
diff --git a/src/data/field/information.cpp b/src/data/field/information.cpp
index 6bc1b77f..cc878620 100644
--- a/src/data/field/information.cpp
+++ b/src/data/field/information.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/information.hpp>
 #include <script/script.hpp>
 
diff --git a/src/data/field/multiple_choice.cpp b/src/data/field/multiple_choice.cpp
index 0b582bf5..0e6701f1 100644
--- a/src/data/field/multiple_choice.cpp
+++ b/src/data/field/multiple_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/multiple_choice.hpp>
 
 // ----------------------------------------------------------------------------- : MultipleChoiceField
diff --git a/src/data/field/package_choice.cpp b/src/data/field/package_choice.cpp
index 07eb9e72..c5df5b20 100644
--- a/src/data/field/package_choice.cpp
+++ b/src/data/field/package_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/package_choice.hpp>
 #include <util/io/package_manager.hpp>
 
diff --git a/src/data/field/symbol.cpp b/src/data/field/symbol.cpp
index 62e48122..8a2667f2 100644
--- a/src/data/field/symbol.cpp
+++ b/src/data/field/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/symbol.hpp>
 #include <render/symbol/filter.hpp>
 
diff --git a/src/data/field/text.cpp b/src/data/field/text.cpp
index 3c6b470c..960ef364 100644
--- a/src/data/field/text.cpp
+++ b/src/data/field/text.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/field/text.hpp>
 #include <util/tagged_string.hpp>
 #include <script/script.hpp>
diff --git a/src/data/font.cpp b/src/data/font.cpp
index 20eaf8bf..f09d43fb 100644
--- a/src/data/font.cpp
+++ b/src/data/font.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/font.hpp>
 
 // ----------------------------------------------------------------------------- : Font
diff --git a/src/data/format/apprentice.cpp b/src/data/format/apprentice.cpp
index 721e0327..8c9a1c7c 100644
--- a/src/data/format/apprentice.cpp
+++ b/src/data/format/apprentice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/settings.hpp>
 #include <data/set.hpp>
diff --git a/src/data/format/clipboard.cpp b/src/data/format/clipboard.cpp
index 88b96598..230a960b 100644
--- a/src/data/format/clipboard.cpp
+++ b/src/data/format/clipboard.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/clipboard.hpp>
 #include <data/format/formats.hpp>
 #include <data/card.hpp>
diff --git a/src/data/format/formats.cpp b/src/data/format/formats.cpp
index d9a07a52..fb8ff3a0 100644
--- a/src/data/format/formats.cpp
+++ b/src/data/format/formats.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/set.hpp>
 
diff --git a/src/data/format/html.cpp b/src/data/format/html.cpp
index b091b689..9375287e 100644
--- a/src/data/format/html.cpp
+++ b/src/data/format/html.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 
 // ----------------------------------------------------------------------------- : 
diff --git a/src/data/format/image.cpp b/src/data/format/image.cpp
index d1d60c1f..8c191c35 100644
--- a/src/data/format/image.cpp
+++ b/src/data/format/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/set.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/data/format/image_to_symbol.cpp b/src/data/format/image_to_symbol.cpp
index 1a505b06..f921cf23 100644
--- a/src/data/format/image_to_symbol.cpp
+++ b/src/data/format/image_to_symbol.cpp
@@ -13,6 +13,7 @@
 	#pragma warning(disable:4996)
 #endif
 
+#include <util/prec.hpp>
 #include <data/format/image_to_symbol.hpp>
 #include <gfx/bezier.hpp>
 #include <util/error.hpp>
diff --git a/src/data/format/mse1.cpp b/src/data/format/mse1.cpp
index 1e90ed3a..f2109ca5 100644
--- a/src/data/format/mse1.cpp
+++ b/src/data/format/mse1.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/set.hpp>
 #include <data/game.hpp>
diff --git a/src/data/format/mse2.cpp b/src/data/format/mse2.cpp
index c7e9231c..0ffce14d 100644
--- a/src/data/format/mse2.cpp
+++ b/src/data/format/mse2.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/set.hpp>
 #include <data/settings.hpp>
diff --git a/src/data/format/mtg_editor.cpp b/src/data/format/mtg_editor.cpp
index bde32c27..6bafef18 100644
--- a/src/data/format/mtg_editor.cpp
+++ b/src/data/format/mtg_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/set.hpp>
 #include <data/game.hpp>
diff --git a/src/data/format/mws.cpp b/src/data/format/mws.cpp
index 16557ca8..cbb45db9 100644
--- a/src/data/format/mws.cpp
+++ b/src/data/format/mws.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/format/formats.hpp>
 #include <data/game.hpp>
 #include <data/set.hpp>
diff --git a/src/data/game.cpp b/src/data/game.cpp
index 496e0d8b..de44ae78 100644
--- a/src/data/game.cpp
+++ b/src/data/game.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/game.hpp>
 #include <data/field.hpp>
 #include <data/field/choice.hpp>
diff --git a/src/data/installer.cpp b/src/data/installer.cpp
index ef5e1c38..7ad82b51 100644
--- a/src/data/installer.cpp
+++ b/src/data/installer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/installer.hpp>
 #include <data/locale.hpp>
 #include <data/game.hpp>
@@ -23,6 +24,8 @@
 DECLARE_TYPEOF_COLLECTION(String);
 DECLARE_TYPEOF_COLLECTION(PackagedP);
 DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
+DECLARE_TYPEOF_COLLECTION(PackageDescriptionP);
+DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
 DECLARE_POINTER_TYPE(wxFileInputStream);
 DECLARE_POINTER_TYPE(wxZipInputStream);
 
@@ -64,11 +67,12 @@ struct dependency_check : public unary_function<bool, PackagedP> {
 
 void Installer::install(bool local, bool check_dependencies) {
 	// Destination directory
-	String install_dir = local ? ::packages.getLocalDataDir() : ::packages.getGlobalDataDir();
+//	String install_dir = local ? ::packages.getLocalDataDir() : ::packages.getGlobalDataDir();
+	String install_dir = _("TODO");
 	if (!wxDirExists(install_dir)) {
 		wxMkdir(install_dir, 0755);
 	}
-	
+	/*
 	// All the packages we're installing.
 	vector<PackagedP> new_packages;
 
@@ -130,6 +134,7 @@ void Installer::install(bool local, bool check_dependencies) {
 		}
 		os.Write(*is);
 	}
+	*/
 }
 
 void Installer::install(const String& package) {
@@ -151,13 +156,16 @@ void Installer::addPackage(const String& package) {
 void Installer::addPackage(Packaged& package) {
 	// Add to list of packages
 	String name = package.relativeFilename();
-	if (find(packages.begin(), packages.end(), package.name()) != packages.end()) {
-		return; // already added
+	FOR_EACH(p, packages) {
+		if (p->name == name) {
+			return; // already added
+		}
 	}
+	packages.push_back(new_intrusive1<PackageDescription>(package));
+	// use this as a filename?
 	if (prefered_filename.empty()) {
 		prefered_filename = package.name() + _(".mse-installer");
 	}
-	packages.push_back(name);
 	// Copy all files from that package to this one
 	const FileInfos& file_infos = package.getFileInfos();
 	for (FileInfos::const_iterator it = file_infos.begin() ; it != file_infos.end() ; ++it) {
@@ -167,3 +175,280 @@ void Installer::addPackage(Packaged& package) {
 		os->Write(*is);
 	}
 }
+
+// ----------------------------------------------------------------------------- : Installer descriptions
+
+PackageDescription::PackageDescription() : position_hint(0) {}
+PackageDescription::PackageDescription(const Packaged& package)
+	: name(package.relativeFilename())
+	, version(package.version)
+	, short_name(package.short_name)
+	, full_name(package.full_name)
+	, icon_url(_(""))
+	, installer_group(package.installer_group)
+	, position_hint(package.position_hint)
+	//, description(package.description)
+	, dependencies(package.dependencies)
+{
+	// name
+	if (short_name.empty()) {
+		if (!full_name.empty()) short_name = full_name;
+		else short_name = package.name();
+	}
+	if (full_name.empty()) full_name = short_name;
+	// installer group
+	if (installer_group.empty()) {
+		// "game-style.mse-something" -> "game/style" -> "game"
+		installer_group = replace_all(package.name(),_("-"),_("/"));
+		size_t pos = installer_group.find_last_of(_('/'));
+		if (pos != String::npos) installer_group.resize(pos);
+	}
+	// icon
+	InputStreamP file = const_cast<Packaged&>(package).openIconFile();
+	if (file) icon.LoadFile(*file);
+}
+
+IMPLEMENT_REFLECTION_NO_SCRIPT(PackageDescription) {
+	REFLECT(name);
+	REFLECT(version);
+	REFLECT(short_name);
+	REFLECT(full_name);
+	REFLECT(icon_url);
+	REFLECT(installer_group);
+	REFLECT(position_hint);
+	REFLECT(description);
+	REFLECT_N("depends ons", dependencies);
+}
+
+IMPLEMENT_REFLECTION_NO_SCRIPT(InstallerDescription) {
+	REFLECT(packages);
+}
+
+IMPLEMENT_REFLECTION_NO_SCRIPT(DownloadableInstaller) {
+	REFLECT_N("url", installer_url);
+	REFLECT(downloadable);
+	REFLECT(packages);
+}
+
+DownloadableInstaller::~DownloadableInstaller() {
+	if (!installer_file.empty()) {
+		wxRemoveFile(installer_file);
+	}
+}
+
+// ----------------------------------------------------------------------------- : Installable package
+
+InstallablePackage::InstallablePackage() : action(PACKAGE_NOTHING) {}
+InstallablePackage::InstallablePackage(const PackageVersionP& installed, const PackageDescriptionP& description)
+	: installed(installed)
+	, description(description)
+	, action(PACKAGE_NOTHING)
+{}
+
+void InstallablePackage::determineStatus() {
+	status = PACKAGE_NOT_INSTALLED;
+	if (installer) {
+		status = (PackageStatus)(status | PACKAGE_INSTALLABLE);
+	}
+	if (installed) {
+		status = (PackageStatus)(status | PACKAGE_INSTALLED);
+		if (!(installed->status & PackageVersion::STATUS_FIXED)) {
+			status = (PackageStatus)(status | PACKAGE_REMOVABLE);
+		}
+	}
+	if (installed && installed->version < description->version) {
+		status = (PackageStatus)(status | PACKAGE_UPDATES);
+	}
+	if (installed && (installed->status & PackageVersion::STATUS_MODIFIED)) {
+		status = (PackageStatus)(status | PACKAGE_MODIFIED);
+	}
+}
+
+bool InstallablePackage::can(PackageAction act) const {
+	if (act & PACKAGE_INSTALL) return (status & PACKAGE_INSTALLABLE) == PACKAGE_INSTALLABLE;
+	if (act & PACKAGE_UPGRADE) return (status & PACKAGE_UPDATES)     == PACKAGE_UPDATES;
+	if (act & PACKAGE_REMOVE) {
+		bool ok = (status & PACKAGE_REMOVABLE)   == PACKAGE_REMOVABLE;
+		if (!(act & PACKAGE_GLOBAL) && installed && PackageVersion::STATUS_GLOBAL) {
+			// package installed globally can't be removed locally
+			return false;
+		}
+		return ok;
+	}
+	else return false;
+}
+bool InstallablePackage::has(PackageAction act) const {
+	return (action & act) == act;
+}
+
+void InstallablePackage::merge(const InstallablePackage& p) {
+	if (!installed) installed = p.installed;
+	if (!installer) {
+		description = p.description; // installer has new description
+		installer = p.installer;
+	}
+}
+
+
+bool before(const InstallablePackageP& a, const InstallablePackageP& b) {
+	assert(a->description && b->description);
+	return a->description->name < b->description->name;
+}
+void sort(InstallablePackages& packages) {
+	sort(packages.begin(), packages.end(), before);
+}
+
+void merge(InstallablePackages& list1, const InstallablePackages& list2) {
+	InstallablePackages::iterator       it1 = list1.begin();
+	InstallablePackages::const_iterator it2 = list2.begin();
+	InstallablePackages add;
+	while (it1 != list1.end() || it2 != list2.end()) {
+		if (it1 != list1.end() && (it2 == list2.end() || before(*it1,*it2))) {
+			++it1;
+		} else if (it1 == list1.end() || before(*it2,*it1)) {
+			add.push_back(*it2);
+			++it2;
+		} else {
+			(*it1)->merge(**it2);
+			++it1,++it2;
+		}
+	}
+	if (!add.empty()) {
+		list1.insert(list1.end(), add.begin(), add.end());
+		sort(list1);
+	}
+}
+
+void merge(InstallablePackages& installed, const DownloadableInstallerP& installer) {
+	InstallablePackages ips;
+	FOR_EACH(p, installer->packages) {
+		InstallablePackageP ip(new InstallablePackage);
+		ip->description = p;
+		ip->installer = installer;
+		ips.push_back(ip);
+	}
+	merge(installed, ips);
+}
+
+
+bool add_package_dependency(InstallablePackages& packages, const PackageDependency& dep, int where, bool set) {
+	FOR_EACH(p, packages) {
+		if (p->description->name == dep.package) {
+			// Some package depends on this package, so install it if needed
+			// Mark the installation as "automatically needed for X packages"
+			// if !set then instead the dependency is no longer needed because we are not installing the package
+			if (!p->installed || p->installed->version < dep.version) {
+				bool change = false;
+				if (p->action & (PACKAGE_INSTALL | PACKAGE_UPGRADE)) {
+					// this package is already scheduled for installation
+					if (p->automatic) {
+						// we are already automatically depending on this package
+						p->automatic += set ? +1 : -1;
+						if (p->automatic == 0) {
+							// no one needs this package anymore
+							p->action = PACKAGE_NOTHING;
+							change = true;
+						}
+					}
+				} else if (set) {
+					p->action = (PackageAction)(where |
+					            (p->installed ? PACKAGE_UPGRADE : PACKAGE_INSTALL));
+					p->automatic = 1;
+					change = true;
+				}
+				// recursively add/remove dependencies
+				FOR_EACH(dep, p->description->dependencies) {
+					if (!add_package_dependency(packages, *dep, where, set)) {
+						return false; // failed
+					}
+				}
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+void remove_package_dependency(InstallablePackages& packages, const PackageDescription& ver, int where, bool set) {
+	FOR_EACH(p, packages) {
+		FOR_EACH(dep, p->description->dependencies) {
+			if (dep->package == ver.name) {
+				// we can no longer use package p
+				if (p->action & PACKAGE_REMOVE) {
+					if (p->automatic) {
+						p->automatic += set ? +1 : -1;
+						if (p->automatic == 0) {
+							// no one needs this package anymore
+							p->action = PACKAGE_NOTHING;
+							remove_package_dependency(packages, *p->description, where, set);
+						}
+					}
+				} else if (set) {
+					p->action = (PackageAction)(where | PACKAGE_REMOVE);
+					p->automatic = 1;
+					remove_package_dependency(packages, *p->description, where, set);
+				}
+				break;
+			}
+		}
+	}
+}
+
+bool set_package_action_unsafe(InstallablePackages& packages, const InstallablePackageP& package, PackageAction action) {
+	int where = action & PACKAGE_WHERE;
+	if ((action & PACKAGE_INSTALL) || (action & PACKAGE_UPGRADE) || ((action & PACKAGE_NOTHING) && (package->status & PACKAGE_INSTALLED))) {
+		// need the package
+		package->automatic = 0;
+		package->action    = action;
+		// check dependencies
+		FOR_EACH(dep, package->description->dependencies) {
+			if (!add_package_dependency(packages, *dep, where, !(action & PACKAGE_NOTHING))) return false;
+		}
+		return true;
+	} else if ((action & PACKAGE_REMOVE) || ((action & PACKAGE_NOTHING) && !(package->status & PACKAGE_INSTALLED))) {
+		package->automatic = 0;
+		package->action    = action;
+		// check dependencies
+		remove_package_dependency(packages, *package->description, where, !(action & PACKAGE_NOTHING));
+		return true;
+	}
+	return false;
+}
+
+bool set_package_action(InstallablePackages& packages, const InstallablePackageP& package, PackageAction action) {
+	if (package->has(action)) return false;
+	// backup
+	FOR_EACH(p,packages) {
+		p->old_action    = p->action;
+		p->old_automatic = p->automatic;
+	}
+	// set
+	if (set_package_action_unsafe(packages, package, action)) return true;
+	// undo
+	FOR_EACH(p,packages) {
+		p->action    = p->old_action;
+		p->automatic = p->old_automatic;
+	}
+	return false;
+}
+
+
+// ----------------------------------------------------------------------------- : MSE package
+
+String mse_package = _("magicseteditor.exe");
+
+InstallablePackageP mse_installable_package() {
+	PackageVersionP mse_version(new PackageVersion(
+		PackageVersion::STATUS_GLOBAL |
+		PackageVersion::STATUS_BLESSED |
+		PackageVersion::STATUS_FIXED));
+	mse_version->name    = mse_package;
+	mse_version->version = app_version;
+	PackageDescriptionP mse_description(new PackageDescription);
+	mse_description->name          = mse_package;
+	mse_description->short_name    = mse_description->full_name = _TITLE_("magic set editor");
+	mse_description->position_hint = -100;
+	//mse_description->icon          = load_resource_image(_("mse_icon"));
+	//mse_description->description   = _LABEL_("magic set editor package");
+	return new_intrusive2<InstallablePackage>(mse_version,mse_description);
+}
diff --git a/src/data/installer.hpp b/src/data/installer.hpp
index 241b51c3..aa5fbc4c 100644
--- a/src/data/installer.hpp
+++ b/src/data/installer.hpp
@@ -9,22 +9,14 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
-#include <data/settings.hpp>
 #include <util/prec.hpp>
 #include <util/io/package.hpp>
 
-// ----------------------------------------------------------------------------- : InstallType
-// Platform default install directory.
-#ifdef __WXMSW__
-#define DEFAULT_INSTALL_LOCAL false
-#else
-#define DEFAULT_INSTALL_LOCAL true
-#endif
-
-inline bool isInstallLocal(const InstallType& type)
-{
-	return type == INSTALL_DEFAULT ? DEFAULT_INSTALL_LOCAL : type == INSTALL_LOCAL;
-}
+DECLARE_POINTER_TYPE(Installer);
+DECLARE_POINTER_TYPE(PackageVersion);
+DECLARE_POINTER_TYPE(PackageDescription);
+DECLARE_POINTER_TYPE(DownloadableInstaller);
+DECLARE_POINTER_TYPE(InstallablePackage);
 
 // ----------------------------------------------------------------------------- : Installer
 
@@ -32,7 +24,7 @@ inline bool isInstallLocal(const InstallType& type)
 class Installer : public Packaged {
   public:
 	String prefered_filename;	///< What filename should be used (by default)
-	vector<String> packages;	///< Packages to install
+	vector<PackageDescriptionP> packages;	///< Packages to install
 	
 	/// Load an installer from a file, and run it
 	static void installFrom(const String& filename, bool message_on_success, bool local);
@@ -40,7 +32,7 @@ class Installer : public Packaged {
 	void install(bool local, bool check_dependencies = true);
 	/// Install a specific package
 	void install(const String& package);
-	
+		
 	/// Add a package to the installer (if it is not already added).
 	/** If the package is named *.mse-installer uses it as the filename instead */
 	void addPackage(const String& package);
@@ -54,5 +46,133 @@ class Installer : public Packaged {
 	DECLARE_REFLECTION();
 };
 
+// ----------------------------------------------------------------------------- : Installer descriptions
+
+/// A description of a package in an installer
+class PackageDescription : public IntrusivePtrBase<PackageDescription> {
+  public:
+	PackageDescription();
+	PackageDescription(const Packaged& package);
+	
+	String name;				///< Filename of the package
+	Version version;			///< Version number of this package
+	String short_name;			///< Short name of this package
+	String full_name;			///< Name of this package, for menus etc.
+	String icon_url;			///< Filename or URL of icon to use in package lists
+	Image  icon;				///< Icon for the package
+	String installer_group;		///< Where to put this package in the installer
+	int    position_hint;		///< A hint for the package list
+	String description;			///< Changelog/description
+	vector<PackageDependencyP> dependencies;	///< Dependencies of this package
+	
+	DECLARE_REFLECTION();
+};
+
+/// A description of the contents of an installer
+class InstallerDescription : public IntrusivePtrBase<InstallerDescription> {
+  public:
+	vector<PackageDescriptionP> packages;
+	
+	DECLARE_REFLECTION();
+};
+
+/// Information on an installer that can be downloaded
+class DownloadableInstaller : public IntrusivePtrBase<DownloadableInstaller> {
+  public:
+	DownloadableInstaller() : downloadable(true) {}
+	DownloadableInstaller(const InstallerP& installer);
+	~DownloadableInstaller();
+	
+	InstallerP installer;      ///< The installer, if it is loaded
+	String     installer_url;  ///< The URL where the installer can be found
+	String     installer_file; ///< The temp file where the installer can be found (after downloading)
+	bool       downloadable;   ///< Is the installer downloadable (in)directly from that url?
+	vector<PackageDescriptionP> packages; ///< Packages provided by this installer
+	
+	DECLARE_REFLECTION();
+};
+
+// ----------------------------------------------------------------------------- : Installable package
+
+/// Installation status of a package
+enum PackageStatus
+{	PACKAGE_NOT_INSTALLED = 0x0000
+,	PACKAGE_INSTALLED     = 0x0001
+,	PACKAGE_REMOVABLE     = 0x0002
+,	PACKAGE_INSTALLABLE   = 0x0010
+,	PACKAGE_UPDATES       = 0x0111 ///< Remote updates available
+,	PACKAGE_MODIFIED      = 0x1001 ///< Local changes made
+,	PACKAGE_CONFLICTS     = PACKAGE_UPDATES | PACKAGE_MODIFIED
+};
+
+/// (un)install a package?
+enum PackageAction
+{	PACKAGE_NOTHING = 0x001  ///< Don't change anything
+,	PACKAGE_INSTALL = 0x002  ///< Install the package
+,	PACKAGE_UPGRADE = 0x004  ///< Upgrade the package
+,	PACKAGE_REMOVE  = 0x008  ///< Remove the package
+,	PACKAGE_LOCAL   = 0x010  ///< In the local package directory
+,	PACKAGE_GLOBAL  = 0x020  ///< In the global package directory
+,	PACKAGE_WHERE   = PACKAGE_LOCAL | PACKAGE_GLOBAL
+};
+
+/// A package that can be installed, or is already installed
+class InstallablePackage : public IntrusivePtrVirtualBase {
+  public:
+	InstallablePackage();
+	InstallablePackage(const PackageVersionP&, const PackageDescriptionP&);
+	
+	PackageVersionP        installed;   ///< The information of the installed package (if installed)
+	PackageDescriptionP    description; ///< The details of the package. Either from the installed package or from an installer
+	DownloadableInstallerP installer;   ///< The installer to install from (if updates are available)
+	PackageStatus          status;      ///< Status of installation
+	PackageAction          action;      ///< What to do with this package?
+	
+	int automatic; ///< Install/upgrade/remove automaticly to satisfy this many packages
+	
+	
+	PackageAction old_action;
+	int           old_automatic;
+	
+	void determineStatus();
+	
+	/// Is the action possible?
+	bool can(PackageAction act) const;
+	/// Is the action currently selected?
+	bool has(PackageAction act) const;
+	
+	/// Merge two descriptions of installable packages
+	void merge(const InstallablePackage& p2);
+};
+
+
+typedef vector<InstallablePackageP> InstallablePackages;
+
+/// Sort a list of InstallablePackages by package name
+void sort(InstallablePackages& packages);
+
+/// Merge two lists of InstallablePackages.
+/** The first list contains installed packages, the second list contains packages in an installer
+ *  @pre both lists are sorted by package name
+ *  @post the output will be sorted
+ */
+void merge(InstallablePackages& installed, const InstallablePackages& from_installer);
+
+/// Merge the packages from a DownloadableInstaller into a list of InstallablePackages.
+void merge(InstallablePackages& installed, const DownloadableInstallerP& installer);
+
+/// Set the action to perform on a given package, makes sure the dependencies are also set correctly
+/** Returns true on success
+ *  action may be PACKAGE_NOTHING to clear the action
+ */
+bool set_package_action(InstallablePackages& packages, const InstallablePackageP& package, PackageAction action);
+
+// ----------------------------------------------------------------------------- : Program package
+
+/// The "magicseteditor.exe" package is special, it refers to the program
+extern String mse_package;
+
+InstallablePackageP mse_installable_package();
+
 // ----------------------------------------------------------------------------- : EOF
 #endif
diff --git a/src/data/keyword.cpp b/src/data/keyword.cpp
index 06cb3789..7abfa1dd 100644
--- a/src/data/keyword.cpp
+++ b/src/data/keyword.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/keyword.hpp>
 #include <util/tagged_string.hpp>
 
diff --git a/src/data/locale.cpp b/src/data/locale.cpp
index 361ccaa2..eb8ffebd 100644
--- a/src/data/locale.cpp
+++ b/src/data/locale.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/locale.hpp>
 #include <data/game.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/data/pack.cpp b/src/data/pack.cpp
index 35bcf41e..1c852dcd 100644
--- a/src/data/pack.cpp
+++ b/src/data/pack.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/pack.hpp>
 
 // ----------------------------------------------------------------------------- : PackType
diff --git a/src/data/set.cpp b/src/data/set.cpp
index db958fae..0bb458f3 100644
--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/set.hpp>
 #include <data/game.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/data/settings.cpp b/src/data/settings.cpp
index 834c9883..ce8a5cdc 100644
--- a/src/data/settings.cpp
+++ b/src/data/settings.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/settings.hpp>
 #include <data/installer.hpp>
 #include <data/game.hpp>
@@ -38,6 +39,15 @@ IMPLEMENT_REFLECTION_ENUM(InstallType) {
 	VALUE_N("global",	INSTALL_GLOBAL);
 }
 
+bool is_install_local(InstallType type) {
+	#ifdef __WXMSW__
+		#define DEFAULT_INSTALL_LOCAL false
+	#else
+		#define DEFAULT_INSTALL_LOCAL true
+	#endif
+	return type == INSTALL_DEFAULT ? DEFAULT_INSTALL_LOCAL : type == INSTALL_LOCAL;
+}
+
 IMPLEMENT_REFLECTION_ENUM(FilenameConflicts) {
 	VALUE_N("keep old",			CONFLICT_KEEP_OLD);
 	VALUE_N("overwrite",		CONFLICT_OVERWRITE);
@@ -143,8 +153,10 @@ Settings::Settings()
 	, symbol_grid_size     (30)
 	, symbol_grid          (true)
 	, symbol_grid_snap     (false)
-	, updates_url          (_("http://magicseteditor.sourceforge.net/updates"))
+	, package_versions_url (_("http://magicseteditor.sourceforge.net/packages"))
+	, installer_list_url   (_("http://magicseteditor.sourceforge.net/installers"))
 	, check_updates        (CHECK_IF_CONNECTED)
+	, check_updates_all    (true)
 	, install_type         (INSTALL_DEFAULT)
 	, website_url          (_("http://magicseteditor.sourceforge.net/"))
 {}
@@ -221,8 +233,11 @@ IMPLEMENT_REFLECTION_NO_SCRIPT(Settings) {
 	REFLECT(symbol_grid_snap);
 	REFLECT(default_game);
 	REFLECT(apprentice_location);
-	REFLECT(updates_url);
+	REFLECT_IGNORE(306,"updates url");
+	REFLECT(package_versions_url);
+	REFLECT(installer_list_url);
 	REFLECT(check_updates);
+	REFLECT(check_updates_all);
 	REFLECT(install_type);
 	REFLECT(website_url);
 	REFLECT(game_settings);
diff --git a/src/data/settings.hpp b/src/data/settings.hpp
index 7dc074a3..63257be2 100644
--- a/src/data/settings.hpp
+++ b/src/data/settings.hpp
@@ -41,6 +41,7 @@ enum InstallType
 };
 
 bool parse_enum(const String&, InstallType&);
+bool is_install_local(InstallType type);
 
 /// How to handle filename conflicts
 enum FilenameConflicts
@@ -164,11 +165,12 @@ class Settings {
 	
 	// --------------------------------------------------- : Special game stuff
 	String apprentice_location;
-	String mws_location;
 	
 	// --------------------------------------------------- : Update checking
-	String updates_url;
+	String package_versions_url; ///< latest package versions
+	String installer_list_url;   ///< available installers
 	CheckUpdates check_updates;
+	bool   check_updates_all; ///< Check updates of all packages, not just the program
 	String website_url;
 	
 	// --------------------------------------------------- : Installation settings
diff --git a/src/data/statistics.cpp b/src/data/statistics.cpp
index 79dfaf96..ce52233b 100644
--- a/src/data/statistics.cpp
+++ b/src/data/statistics.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/statistics.hpp>
 #include <data/field.hpp>
 #include <data/field/choice.hpp>
diff --git a/src/data/stylesheet.cpp b/src/data/stylesheet.cpp
index 1c0380c4..de6b58eb 100644
--- a/src/data/stylesheet.cpp
+++ b/src/data/stylesheet.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/stylesheet.hpp>
 #include <data/game.hpp>
 #include <data/field.hpp>
diff --git a/src/data/symbol.cpp b/src/data/symbol.cpp
index 4b562b4a..c77972a5 100644
--- a/src/data/symbol.cpp
+++ b/src/data/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/symbol.hpp>
 #include <script/to_value.hpp>
 #include <gfx/bezier.hpp>
diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp
index 462b3d05..31719a78 100644
--- a/src/data/symbol_font.cpp
+++ b/src/data/symbol_font.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/symbol_font.hpp>
 #include <data/stylesheet.hpp>
 #include <util/dynamic_arg.hpp>
diff --git a/src/data/word_list.cpp b/src/data/word_list.cpp
index 7b19ca62..c15c2093 100644
--- a/src/data/word_list.cpp
+++ b/src/data/word_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <data/word_list.hpp>
 
 // ----------------------------------------------------------------------------- : WordList
diff --git a/src/gfx/bezier.cpp b/src/gfx/bezier.cpp
index 43e64bc9..44c3bc50 100644
--- a/src/gfx/bezier.cpp
+++ b/src/gfx/bezier.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/bezier.hpp>
 #include <gfx/polynomial.hpp>
 
diff --git a/src/gfx/blend_image.cpp b/src/gfx/blend_image.cpp
index 28bc80fa..47d99b0b 100644
--- a/src/gfx/blend_image.cpp
+++ b/src/gfx/blend_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/error.hpp>
 
diff --git a/src/gfx/color.cpp b/src/gfx/color.cpp
index a25b485f..ec533023 100644
--- a/src/gfx/color.cpp
+++ b/src/gfx/color.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 
 // ----------------------------------------------------------------------------- : Color utility functions
diff --git a/src/gfx/combine_image.cpp b/src/gfx/combine_image.cpp
index e3370a49..82e643b4 100644
--- a/src/gfx/combine_image.cpp
+++ b/src/gfx/combine_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/reflect.hpp>
 #include <algorithm>
diff --git a/src/gfx/generated_image.cpp b/src/gfx/generated_image.cpp
index bff22e5f..f8253798 100644
--- a/src/gfx/generated_image.cpp
+++ b/src/gfx/generated_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/generated_image.hpp>
 #include <util/io/package.hpp>
 #include <util/error.hpp>
diff --git a/src/gfx/image_effects.cpp b/src/gfx/image_effects.cpp
index fb452831..5160ebfc 100644
--- a/src/gfx/image_effects.cpp
+++ b/src/gfx/image_effects.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/error.hpp>
 
diff --git a/src/gfx/mask_image.cpp b/src/gfx/mask_image.cpp
index e27036c8..5319b509 100644
--- a/src/gfx/mask_image.cpp
+++ b/src/gfx/mask_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/error.hpp>
 
diff --git a/src/gfx/polynomial.cpp b/src/gfx/polynomial.cpp
index f136613f..a649cac5 100644
--- a/src/gfx/polynomial.cpp
+++ b/src/gfx/polynomial.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/polynomial.hpp>
 #include <complex>
 
diff --git a/src/gfx/resample_image.cpp b/src/gfx/resample_image.cpp
index 919c9ddf..c69547a4 100644
--- a/src/gfx/resample_image.cpp
+++ b/src/gfx/resample_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/error.hpp>
 
diff --git a/src/gfx/resample_text.cpp b/src/gfx/resample_text.cpp
index d66ce6a3..bd623efe 100644
--- a/src/gfx/resample_text.cpp
+++ b/src/gfx/resample_text.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 #include <util/error.hpp>
 #include <gui/util.hpp> // clearDC_black
diff --git a/src/gfx/rotate_image.cpp b/src/gfx/rotate_image.cpp
index 9c71f8fe..da2ed905 100644
--- a/src/gfx/rotate_image.cpp
+++ b/src/gfx/rotate_image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gfx/gfx.hpp>
 
 // ----------------------------------------------------------------------------- : Implementation
diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp
index 70916985..e3bc4b9e 100644
--- a/src/gui/about_window.cpp
+++ b/src/gui/about_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/about_window.hpp>
 #include <gui/util.hpp>
 #include <util/version.hpp>
diff --git a/src/gui/auto_replace_window.cpp b/src/gui/auto_replace_window.cpp
index 990bb7df..641db1cf 100644
--- a/src/gui/auto_replace_window.cpp
+++ b/src/gui/auto_replace_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/auto_replace_window.hpp>
 #include <gui/control/item_list.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/card_select_window.cpp b/src/gui/card_select_window.cpp
index b635fe41..dbd266d8 100644
--- a/src/gui/card_select_window.cpp
+++ b/src/gui/card_select_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/card_select_window.hpp>
 #include <gui/control/select_card_list.hpp>
 #include <util/window_id.hpp>
diff --git a/src/gui/control/card_editor.cpp b/src/gui/control/card_editor.cpp
index d9a936af..ae809caa 100644
--- a/src/gui/control/card_editor.cpp
+++ b/src/gui/control/card_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/card_editor.hpp>
 #include <gui/value/editor.hpp>
 #include <gui/icon_menu.hpp>
diff --git a/src/gui/control/card_list.cpp b/src/gui/control/card_list.cpp
index ac89133b..696c2af9 100644
--- a/src/gui/control/card_list.cpp
+++ b/src/gui/control/card_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/card_list.hpp>
 #include <gui/control/card_list_column_select.hpp>
 #include <gui/icon_menu.hpp>
diff --git a/src/gui/control/card_list_column_select.cpp b/src/gui/control/card_list_column_select.cpp
index d54f8f9d..e2b26d00 100644
--- a/src/gui/control/card_list_column_select.cpp
+++ b/src/gui/control/card_list_column_select.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/card_list_column_select.hpp>
 #include <data/game.hpp>
 #include <data/field.hpp>
diff --git a/src/gui/control/card_viewer.cpp b/src/gui/control/card_viewer.cpp
index 45231d6d..7b52c8a4 100644
--- a/src/gui/control/card_viewer.cpp
+++ b/src/gui/control/card_viewer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/card_viewer.hpp>
 #include <data/stylesheet.hpp>
 #include <data/settings.hpp>
diff --git a/src/gui/control/filtered_card_list.cpp b/src/gui/control/filtered_card_list.cpp
index f40fa63e..505779ff 100644
--- a/src/gui/control/filtered_card_list.cpp
+++ b/src/gui/control/filtered_card_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/filtered_card_list.hpp>
 
 DECLARE_TYPEOF_COLLECTION(CardP);
diff --git a/src/gui/control/gallery_list.cpp b/src/gui/control/gallery_list.cpp
index 0ee0138b..dab77c01 100644
--- a/src/gui/control/gallery_list.cpp
+++ b/src/gui/control/gallery_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/gallery_list.hpp>
 #include <gfx/gfx.hpp>
 #include <wx/dcbuffer.h>
@@ -91,7 +92,6 @@ void GalleryList::scrollTo(int top, bool update_scrollbar) {
 	top = max(0, top);
 	// scroll
 	if (top == visible_start) return;
-	//%int old_top = visible_start;
 	visible_start = top;
 	if (update_scrollbar) {
 		// scroll bar
diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index 579ae01a..31111041 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/graph.hpp>
 #include <util/alignment.hpp>
 #include <gfx/gfx.hpp>
diff --git a/src/gui/control/image_card_list.cpp b/src/gui/control/image_card_list.cpp
index cbc0929f..45d1b09e 100644
--- a/src/gui/control/image_card_list.cpp
+++ b/src/gui/control/image_card_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/image_card_list.hpp>
 #include <gui/thumbnail_thread.hpp>
 #include <data/field/image.hpp>
diff --git a/src/gui/control/item_list.cpp b/src/gui/control/item_list.cpp
index 88185ccb..04367162 100644
--- a/src/gui/control/item_list.cpp
+++ b/src/gui/control/item_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/item_list.hpp>
 #include <gui/util.hpp>
 #include <wx/imaglist.h>
diff --git a/src/gui/control/item_list.hpp b/src/gui/control/item_list.hpp
index 89032159..dc46449e 100644
--- a/src/gui/control/item_list.hpp
+++ b/src/gui/control/item_list.hpp
@@ -12,8 +12,6 @@
 #include <util/prec.hpp>
 #include <wx/listctrl.h>
 
-typedef intrusive_ptr<IntrusivePtrVirtualBase> VoidP;
-
 // ----------------------------------------------------------------------------- : ItemList
 
 /// A generic list of items
diff --git a/src/gui/control/keyword_list.cpp b/src/gui/control/keyword_list.cpp
index 185786c3..631d5dc3 100644
--- a/src/gui/control/keyword_list.cpp
+++ b/src/gui/control/keyword_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/keyword_list.hpp>
 #include <gui/icon_menu.hpp>
 #include <data/set.hpp>
diff --git a/src/gui/control/native_look_editor.cpp b/src/gui/control/native_look_editor.cpp
index 5d80ffbd..8191f2ee 100644
--- a/src/gui/control/native_look_editor.cpp
+++ b/src/gui/control/native_look_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/native_look_editor.hpp>
 #include <gui/value/editor.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp
index 28e3cfa9..18ab466c 100644
--- a/src/gui/control/package_list.cpp
+++ b/src/gui/control/package_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/package_list.hpp>
 #include <util/io/package_manager.hpp>
 #include <util/alignment.hpp>
diff --git a/src/gui/control/select_card_list.cpp b/src/gui/control/select_card_list.cpp
index fc7dd26a..83ba9911 100644
--- a/src/gui/control/select_card_list.cpp
+++ b/src/gui/control/select_card_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/select_card_list.hpp>
 #include <gui/util.hpp>
 #include <data/card.hpp>
diff --git a/src/gui/control/text_ctrl.cpp b/src/gui/control/text_ctrl.cpp
index b837f327..6e76442c 100644
--- a/src/gui/control/text_ctrl.cpp
+++ b/src/gui/control/text_ctrl.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/text_ctrl.hpp>
 #include <gui/value/editor.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/control/tree_list.cpp b/src/gui/control/tree_list.cpp
index acb3bd67..ade3f6ca 100644
--- a/src/gui/control/tree_list.cpp
+++ b/src/gui/control/tree_list.cpp
@@ -6,12 +6,13 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/control/tree_list.hpp>
 #include <gfx/gfx.hpp>
 #include <wx/renderer.h>
 #include <wx/dcbuffer.h>
 
-DECLARE_TYPEOF_COLLECTION(TreeList::Item);
+DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
 
 // ----------------------------------------------------------------------------- : TreeList : item managment
 
@@ -23,21 +24,28 @@ void TreeList::rebuild(bool full) {
 }
 
 bool TreeList::hasChildren(size_t item) const {
-	return item < items.size() && items[item].level < items[item+1].level;
+	return item + 1 < items.size() && items[item]->level < items[item+1]->level;
 }
 
 void TreeList::expand(size_t item, bool expand) {
-	if (hasChildren(item) && items[item].expanded != expand) {
-		items[item].expanded = expand;
+	if (hasChildren(item) && items[item]->expanded != expand) {
+		items[item]->expanded = expand;
 		rebuild(false);
 	}
 }
 
-void TreeList::select(size_t item) {
+void TreeList::select(size_t item, bool event) {
 	if (item >= items.size() || selection == item) return;
-	size_t oldpos = selection < items.size() ? items[selection].position : 0;
+	// select
+	size_t oldpos = selection < items.size() ? items[selection]->position : 0;
 	selection = item;
-	size_t pos = items[selection].position;
+	size_t pos = items[selection]->position;
+	// event
+	if (event) {
+		wxCommandEvent ev(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
+		ProcessEvent(ev);
+	}
+	// redraw
 	if (pos < first_line) {
 		ScrollToLine(pos);
 	} else if (pos >= first_line + visible_lines_t) {
@@ -53,28 +61,28 @@ void TreeList::calcItemCount() {
 	total_lines = 0;
 	int visible_level = 0;
 	FOR_EACH(i,items) {
-		if (i.level <= visible_level) {
-			i.position = total_lines;
+		if (i->level <= visible_level) {
+			i->position = total_lines;
 			++total_lines;
-			if (i.expanded) visible_level = i.level + 1;
-			else            visible_level = i.level;
+			if (i->expanded) visible_level = i->level + 1;
+			else             visible_level = i->level;
 		} else {
-			i.position = NOTHING;
+			i->position = NOTHING;
 		}
 	}
 	// update lines
 	UInt lines = 0;
 	FOR_EACH_REVERSE(i,items) {
-		if (i.visible()) {
-			i.lines = lines;
-			lines &= (1 << i.level) - 1;
-			lines |= 1 << i.level;
+		if (i->visible()) {
+			i->lines = lines;
+			lines &= (1 << i->level) - 1;
+			lines |= 1 << i->level;
 		}
 	}
 	// selection hidden? move to first visible item before it
 	if (selection < items.size()) {
 		for ( ; selection + 1 > 0 ; --selection) {
-			if (items[selection].visible()) break; // visible
+			if (items[selection]->visible()) break; // visible
 		}
 		if (selection >= items.size()) selection = 0;
 	}
@@ -86,20 +94,20 @@ size_t TreeList::findItemByPos(int y) const {
 }
 size_t TreeList::findItem(size_t line, size_t start) const {
 	for (size_t i = start ; i < items.size() ; ++i) {
-		if (items[i].visible() && items[i].position >= line) return i;
+		if (items[i]->visible() && items[i]->position >= line) return i;
 	}
 	return items.size();
 }
 size_t TreeList::findLastItem(size_t start) const {
 	for (size_t i = min(items.size(), start) - 1 ; i + 1 > 0 ; --i) {
-		if (items[i].visible()) return i;
+		if (items[i]->visible()) return i;
 	}
 	return items.size();
 }
 size_t TreeList::findParent(size_t start) const {
-	int level = items[start].level;
+	int level = items[start]->level;
 	for (size_t i = start - 1 ; i + 1 > 0 ; --i) {
-		if (items[i].visible() && items[i].level < level) return i;
+		if (items[i]->visible() && items[i]->level < level) return i;
 	}
 	return items.size();
 }
@@ -147,9 +155,13 @@ void TreeList::onPaint(wxPaintEvent& ev) {
 	size_t start = findItem(first_line);
 	size_t end   = findItem(first_line + visible_lines);
 	for (size_t i = start ; i < end ; ++i) {
-		const Item& item = items[i];
+		const Item& item = *items[i];
 		if (!item.visible()) continue; // invisible
 		x = level_width * (item.level + 1);
+		// line below
+		dc.SetPen(lerp(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW),
+		               wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT),0.2));
+		dc.DrawLine(x,y+item_height-1,cs.x,y+item_height-1);
 		// draw lines
 		dc.SetPen(lerp(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW),
 		               wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT),0.4));
@@ -171,15 +183,12 @@ void TreeList::onPaint(wxPaintEvent& ev) {
 		if (selection == i) {
 			dc.SetPen(*wxTRANSPARENT_PEN);
 			dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
-			dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-			dc.DrawRectangle(x, y, cs.x-x, item_height);
+			dc.DrawRectangle(x, y, cs.x-x, item_height-1);
 		}
 		// draw text(s)
 		for (size_t j = 0 ; j < cols ; ++j) {
 			int w = columnWidth(j);
-			if (selection != i)
-				dc.SetTextForeground(itemColor(i,j));
-			dc.DrawText(itemText(i,j),x+1,y+1);
+			drawItem(dc, i, j, x+1, y, selection == i);
 			if (j == 0) x = 0;
 			x += w;
 		}
@@ -197,7 +206,7 @@ void TreeList::onChar(wxKeyEvent& ev) {
 			break;
 		} case WXK_LEFT: {
 			if (selection < items.size()) {
-				if (hasChildren(selection) && items[selection].expanded) {
+				if (hasChildren(selection) && items[selection]->expanded) {
 					expand(selection, false);
 				} else {
 					// select parent
@@ -207,7 +216,7 @@ void TreeList::onChar(wxKeyEvent& ev) {
 			break;
 		} case WXK_RIGHT: {
 			if (selection < items.size() && hasChildren(selection)) {
-				if (items[selection].expanded) {
+				if (items[selection]->expanded) {
 					// select first child
 					select(selection+1);
 					Refresh(false);
@@ -216,10 +225,10 @@ void TreeList::onChar(wxKeyEvent& ev) {
 				}
 			}
 			break;
-		} case WXK_PAGEUP: {
+		} case WXK_PAGEUP: case WXK_PRIOR: {
 			ScrollToLine(first_line > visible_lines_t ? first_line - visible_lines_t : 0);
 			break;
-		} case WXK_PAGEDOWN: {
+		} case WXK_PAGEDOWN: case WXK_NEXT: {
 			ScrollToLine(first_line + visible_lines_t);
 			break;
 		} case WXK_HOME: {
@@ -242,9 +251,9 @@ void TreeList::onChar(wxKeyEvent& ev) {
 void TreeList::onLeftDown(wxMouseEvent& ev) {
 	size_t i = findItemByPos(ev.GetY());
 	if (i >= items.size()) return;
-	int left = items[i].level * level_width;
+	int left = items[i]->level * level_width;
 	if (hasChildren(i) && ev.GetX() >= left && ev.GetX() < left + level_width) {
-		expand(i, !items[i].expanded);
+		expand(i, !items[i]->expanded);
 	} else {
 		select(i);
 	}
@@ -255,7 +264,7 @@ void TreeList::onLeftDClick(wxMouseEvent& ev) {
 	size_t i = findItemByPos(ev.GetY());
 	if (i >= items.size()) return;
 	if (hasChildren(i)) {
-		expand(i, !items[i].expanded);
+		expand(i, !items[i]->expanded);
 	}
 	ev.Skip();
 }
@@ -264,7 +273,8 @@ void TreeList::onLeftDClick(wxMouseEvent& ev) {
 
 void TreeList::ScrollToLine(size_t line) {
     // determine the real first line to scroll to: we shouldn't scroll beyond the end
-    line = (size_t)min((int)line, (int)(total_lines - visible_lines_t));
+    line = (size_t)max((int)line, 0);
+    line = (size_t)min((int)line, max(0, (int)(total_lines - visible_lines_t)));
 	// nothing to do?
     if (line == first_line) return;
     first_line = line;
@@ -314,12 +324,13 @@ void TreeList::onScroll(wxScrollWinEvent& ev) {
 
 void TreeList::onSize(wxSizeEvent& ev) {
 	UpdateScrollbar();
+	Refresh(false);
 	ev.Skip();
 }
 
 void TreeList::onMouseWheel(wxMouseEvent& ev) {
-	ScrollLines(-ev.GetWheelRotation() * ev.GetLinesPerAction() / ev.GetWheelDelta());
-	Refresh(false);
+	int delta = -ev.GetWheelRotation() * ev.GetLinesPerAction() / ev.GetWheelDelta();
+	ScrollToLine(first_line + delta);
 }
 
 
diff --git a/src/gui/control/tree_list.hpp b/src/gui/control/tree_list.hpp
index c830a697..69c9af82 100644
--- a/src/gui/control/tree_list.hpp
+++ b/src/gui/control/tree_list.hpp
@@ -12,8 +12,6 @@
 #include <util/prec.hpp>
 #include <wx/vscroll.h>
 
-typedef intrusive_ptr<IntrusivePtrVirtualBase> VoidP;
-
 // ----------------------------------------------------------------------------- : TreeList
 
 /// A combination of a TreeCtrl and a ListCtrl. A tree with multiple columns.
@@ -24,7 +22,7 @@ class TreeList : public wxPanel {
 	/// Expand/collapse an item
 	void expand(size_t item, bool expand = true);
 	/// Select an item
-	void select(size_t item);
+	void select(size_t item, bool event = true);
 	
 	/// (re)build the list
 	void rebuild(bool full = true);
@@ -32,24 +30,26 @@ class TreeList : public wxPanel {
   public:
 	
 	/// An item in the tree list
-	struct Item {
-		Item() {}
-		Item(int level, bool expanded = false, VoidP data = VoidP())
-			: level(level), expanded(expanded), data(data)
-		{}
+	class Item : public IntrusivePtrBase<Item> {
+	  public:
+		Item() : level(0), expanded(false) {}
+		virtual ~Item() {}
 		
 		int    level;
 		bool   expanded;
-		VoidP  data;
+		inline bool visible() const { return position != NOTHING; }
+		
+	  private:
+		friend class TreeList;
 		size_t position; // NOTHING if invisible, otherwise the line the item is on
 		UInt   lines;    // lines in front of this item (bit set)
-		inline bool visible() const { return position != NOTHING; }
 	};
+	typedef intrusive_ptr<Item> ItemP;
 	
   protected:
 	
 	/// The items in the tree list
-	vector<Item> items;
+	vector<ItemP> items;
 	
 	static const size_t NOTHING = (size_t)-1;
 	size_t selection;
@@ -57,10 +57,8 @@ class TreeList : public wxPanel {
 	/// Initialize the items
 	virtual void initItems() = 0;
 	
-	/// Get the text of an item
-	virtual String itemText(size_t item, size_t column) const = 0;
-	/// Get the color of an item
-	virtual Color  itemColor(size_t item, size_t column) const = 0;
+	/// Draw the text of an item
+	virtual void drawItem(DC& dc, size_t index, size_t column, int x, int y, bool selected) const = 0;
 	
 	/// The number of columns
 	virtual size_t columnCount() const = 0;
@@ -69,11 +67,11 @@ class TreeList : public wxPanel {
 	/// The width of a column in pixels
 	virtual int    columnWidth(size_t column) const = 0;
 	
-  private:
 	int    item_height;
 	static const int header_height = 17;
 	static const int level_width   = 17;
 	
+  private:
 	size_t total_lines;     // number of shown items
 	size_t first_line;      // first visible line
 	size_t visible_lines;   // number of (partially) visible lines
diff --git a/src/gui/drop_down_list.cpp b/src/gui/drop_down_list.cpp
index 03b14398..fdd75068 100644
--- a/src/gui/drop_down_list.cpp
+++ b/src/gui/drop_down_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/drop_down_list.hpp>
 #include <gui/util.hpp>
 #include <render/value/viewer.hpp>
diff --git a/src/gui/html_export_window.cpp b/src/gui/html_export_window.cpp
index 8bf75adf..0d559466 100644
--- a/src/gui/html_export_window.cpp
+++ b/src/gui/html_export_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/html_export_window.hpp>
 #include <gui/control/package_list.hpp>
 #include <gui/control/native_look_editor.hpp>
diff --git a/src/gui/icon_menu.cpp b/src/gui/icon_menu.cpp
index 27ddec76..f5205226 100644
--- a/src/gui/icon_menu.cpp
+++ b/src/gui/icon_menu.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/icon_menu.hpp>
 #include <gui/util.hpp>
 
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index 2c2e82a0..1fe37072 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/image_slice_window.hpp>
 #include <gui/util.hpp>
 #include <util/window_id.hpp>
diff --git a/src/gui/images_export_window.cpp b/src/gui/images_export_window.cpp
index 28843bd4..7975898c 100644
--- a/src/gui/images_export_window.cpp
+++ b/src/gui/images_export_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/images_export_window.hpp>
 #include <gui/control/select_card_list.hpp>
 #include <data/settings.hpp>
diff --git a/src/gui/new_window.cpp b/src/gui/new_window.cpp
index 03a47d04..aa7e2f9e 100644
--- a/src/gui/new_window.cpp
+++ b/src/gui/new_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/new_window.hpp>
 #include <gui/control/gallery_list.hpp>
 #include <gui/control/package_list.hpp>
diff --git a/src/gui/packages_window.cpp b/src/gui/packages_window.cpp
new file mode 100644
index 00000000..d8cb975c
--- /dev/null
+++ b/src/gui/packages_window.cpp
@@ -0,0 +1,884 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+#include <gui/packages_window.hpp>
+#include <gui/control/tree_list.hpp>
+//%#include <gui/update_checker.hpp>
+#include <gui/util.hpp>
+#include <util/io/package_repository.hpp>
+#include <util/io/package_manager.hpp>
+#include <util/window_id.hpp>
+#include <data/installer.hpp>
+#include <data/settings.hpp>
+#include <gfx/gfx.hpp>
+//%#include <list>
+//%#include <set>
+#include <wx/wfstream.h>
+#include <wx/html/htmlwin.h>
+#include <wx/dialup.h>
+#include <wx/url.h>
+#include <wx/dcbuffer.h>
+#include <wx/progdlg.h>
+
+//%DECLARE_POINTER_TYPE(VersionData); //%% TODO
+DECLARE_POINTER_TYPE(Installer);
+//%DECLARE_POINTER_TYPE(PackageVersionData);
+
+DECLARE_TYPEOF_COLLECTION(PackageVersionDataP);
+DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
+DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
+DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
+//%DECLARE_TYPEOF(list<PackageVersionDataP>);
+//%DECLARE_TYPEOF(set<String>);
+
+// ----------------------------------------------------------------------------- : TODO: MOVE
+
+/*
+/// Information on available packages
+class PackageVersionData : public IntrusivePtrVirtualBase {
+  public:
+	PackageVersionData() {}
+	
+	String  name;						///< Name of the package
+	String  type;						///< Type of package ("magic style" or "game")
+	String  display_name;				///< Name to show on package list.
+	String  description;				///< html description
+	String  url;						///< Where can the package be downloaded?
+	Version version;					///< Version number of the download
+	Version app_version;				///< The minimium version of MSE required
+	vector<PackageDependencyP> depends;	///< Packages this depends on
+
+	DECLARE_REFLECTION();
+};
+
+/// Information on the latest available version
+class VersionData : public IntrusivePtrBase<VersionData> {
+  public:
+	Version version;				///< Latest version number of MSE
+	String  description;			///< html description of the latest MSE release
+	String  new_updates_url;		///< updates url has moved?
+	vector<PackageVersionDataP> packages;	///< Available packages
+	
+	DECLARE_REFLECTION();
+};
+extern VersionDataP update_version_data;
+
+// A HTML control that opens all pages in an actual browser
+struct HtmlWindowToBrowser : public wxHtmlWindow {
+	HtmlWindowToBrowser(Window* parent, int id, const wxPoint& pos, const wxSize& size, long flags)
+		: wxHtmlWindow(parent, id, pos, size, flags)
+	{}
+		
+	virtual void OnLinkClicked(const wxHtmlLinkInfo& info) {
+		wxLaunchDefaultBrowser( info.GetHref() );
+	}
+};
+
+// ----------------------------------------------------------------------------- : PackageUpdateList
+
+/*
+class PackageUpdateList : public wxVListBox {
+  public:
+	PackageUpdateList(UpdatesWindow* parent)
+		: wxVListBox (parent, ID_PACKAGE_LIST, wxDefaultPosition, wxSize(540,210), wxNO_BORDER | wxVSCROLL)
+		, parent(parent)
+	{
+		if (!checking_updates && !update_version_data) {
+			check_updates_now(true);
+		}
+		SetItemCount(update_version_data ? update_version_data->packages.size() : 1);
+	}
+	
+	virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const {
+		static wxBrush greyBrush(Color(224,224,224));
+		if (checking_updates) {
+			String text = _ERROR_("checking updates");
+			
+			dc.SetPen(*wxTRANSPARENT_PEN);
+			dc.SetBrush(greyBrush);
+			dc.DrawRectangle(rect);
+			
+			int w, h;
+			dc.GetTextExtent(text, &w, &h);
+			dc.DrawText(text, rect.GetLeft() + (rect.GetWidth() - w) / 2, rect.GetTop() + (rect.GetHeight() - h) / 2);
+		} else if (!update_version_data || update_version_data->packages.empty()) {
+			String text = _ERROR_("no packages");
+			
+			dc.SetPen(*wxTRANSPARENT_PEN);
+			dc.SetBrush(greyBrush);
+			dc.DrawRectangle(rect);
+			
+			int w, h;
+			dc.GetTextExtent(text, &w, &h);
+			dc.DrawText(text, rect.GetLeft() + (rect.GetWidth() - w) / 2, rect.GetTop() + (rect.GetHeight() - h) / 2);
+		} else {
+			static wxBrush darkBrush(Color(192,224,255));
+			static wxBrush selectBrush(Color(96,96,192));
+			
+			PackageVersionDataP pack = update_version_data->packages[n];
+			UpdatesWindow::PackageStatus status = parent->package_data[pack].first;
+			UpdatesWindow::PackageAction action = parent->package_data[pack].second;
+			
+			dc.SetPen(*wxTRANSPARENT_PEN);
+			dc.SetBrush(IsSelected(n) ? selectBrush : (n % 2 ? *wxWHITE_BRUSH : darkBrush));
+			
+			dc.DrawRectangle(rect);
+			
+			// These two arrays correspond to PackageStatus and PackageAction, respectively
+			static Color status_colors [] = {
+				 Color(32,160,32)
+				,Color(32,32,255)
+				,Color(192,32,32)
+			};
+			
+			static Color action_colors [] = {
+				 Color(32,160,32)
+				,Color(192,32,32)
+				,Color(192,192,32)
+				,Color(32,32,255)
+				,Color(32,32,32)
+			};
+			
+			// Ditto here (these are the locale names)
+			static String status_texts [] = {
+				 _TYPE_("installed")
+				,_TYPE_("uninstalled")
+				,_TYPE_("upgradeable")
+			};
+			
+			static String action_texts [] = {
+				 _TYPE_("install")
+				,_TYPE_("uninstall")
+				,_TYPE_("upgrade")
+				,_TYPE_("do nothing")
+				,_TYPE_("new mse")
+			};
+			
+			static Color packageFront(64,64,64);
+			
+			#define SELECT_WHITE(color) (IsSelected(n) ? *wxWHITE : color)
+			
+			dc.SetClippingRegion(wxRect(rect.x, rect.y, 180, rect.height));
+			dc.SetTextForeground(SELECT_WHITE(packageFront));
+			dc.DrawText(pack->display_name, rect.GetLeft() + 1, rect.GetTop());
+			dc.DestroyClippingRegion();
+			
+			dc.SetClippingRegion(wxRect(rect.x + 180, rect.y, 120, rect.height));
+			dc.DrawText(pack->type, rect.GetLeft() + 180, rect.GetTop());
+			dc.DestroyClippingRegion();
+			
+			dc.SetTextForeground(SELECT_WHITE(status_colors[status]));
+			dc.DrawText(status_texts[status], rect.GetLeft() + 300, rect.GetTop());
+			
+			dc.SetTextForeground(SELECT_WHITE(action_colors[action]));
+			dc.DrawText(action_texts[action], rect.GetLeft() + 420, rect.GetTop());
+			
+			#undef SELECT_WHITE
+		}
+	}
+	
+	virtual wxCoord OnMeasureItem(size_t) const {
+		return (update_version_data && !update_version_data->packages.empty()) ? 15 : 210;
+	}
+	
+	void onUpdateCheckingFinished(wxEvent& event) {
+		SetItemCount(update_version_data ? update_version_data->packages.size() : 1);
+	}
+	
+	virtual wxCoord EstimateTotalHeight() const {
+		return (update_version_data && !update_version_data->packages.empty())
+		           ? 15 * (int)update_version_data->packages.size()
+		           : 210;
+	}
+  private:
+	DECLARE_EVENT_TABLE()
+
+	UpdatesWindow* parent;
+};
+
+BEGIN_EVENT_TABLE(PackageUpdateList, wxVListBox)
+	EVT_CUSTOM(UPDATE_CHECK_FINISHED_EVT, wxID_ANY, PackageUpdateList::onUpdateCheckingFinished)
+END_EVENT_TABLE()
+*/
+
+
+// ----------------------------------------------------------------------------- : PackageUpdateList
+
+/// A list of installed and downloadable packages
+class PackageUpdateList : public TreeList {
+  public:
+	PackageUpdateList(PackagesWindow* parent, int id = wxID_ANY)
+		: TreeList(parent, id)
+		, parent(parent)
+		, images(16,16)
+	{
+		item_height = max(item_height,17);
+		rebuild();
+	}
+	
+	InstallablePackageP getSelection() const {
+		return selection == NOTHING ? InstallablePackageP() : get(selection);
+	}
+	
+	InstallablePackageP get(size_t item) const {
+		return static_pointer_cast<TreeItem>(items[item])->package;
+	}
+		
+  protected:
+	virtual void initItems();
+	virtual void drawItem(DC& dc, size_t index, size_t column, int x, int y, bool selected) const;
+	
+	virtual size_t columnCount() const { return 3; }
+	virtual String columnText(size_t column) const;
+	virtual int    columnWidth(size_t column) const;
+	
+  private:
+	PackagesWindow* parent;
+	mutable wxImageList images;
+	class TreeItem;
+  public:
+	typedef intrusive_ptr<TreeItem> TreeItemP;
+  private:
+	class TreeItem : public Item {
+	  public:
+		String label;
+		vector<TreeItemP> children;
+		InstallablePackageP package;
+		
+		void add(const InstallablePackageP& package, const String& path, int level = -1);
+		void toItems(vector<TreeList::ItemP>& items);
+	};
+};
+
+DECLARE_TYPEOF_COLLECTION(PackageUpdateList::TreeItemP);
+
+
+void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const String& path, int level) {
+	size_t pos = path.find_first_of(_('/'));
+	String name = path.substr(0,pos);
+	String rest = pos == String::npos ? _("") : path.substr(pos+1);
+	// find/add child
+	FOR_EACH(ti, children) {
+		if (ti->label == name) {
+			// already have this child
+			if (pos == String::npos) {
+				if (ti->package) {
+					// two packages with the same path
+					TreeItemP ti2(new TreeItem);
+					ti2->level = level + 1;
+					ti2->label = name;
+					ti2->package = package;
+					children.insert(ti_IT.first, ti2);
+				} else {
+					ti->package = package;
+				}
+			} else {
+				ti->add(package, rest, level + 1);
+			}
+			return;
+		}
+	}
+	// don't have this child
+	TreeItemP ti(new TreeItem);
+	children.push_back(ti);
+	ti->level = level + 1;
+	ti->label = name;
+	if (pos == String::npos) {
+		ti->package = package;
+	} else {
+		ti->add(package, rest, level + 1);
+	}
+}
+
+bool compare_pos_hint(const PackageUpdateList::TreeItemP& a, const PackageUpdateList::TreeItemP& b) {
+	int pa = a->package ? a->package->description->position_hint : 0;
+	int pb = b->package ? b->package->description->position_hint : 0;
+	if (pa < pb) return true;
+	if (pa > pb) return false;
+	return a->label < b->label;
+}
+
+void PackageUpdateList::TreeItem::toItems(vector<TreeList::ItemP>& items) {
+	sort(children.begin(), children.end(), compare_pos_hint);
+	FOR_EACH(c, children) {
+		items.push_back(c);
+		c->toItems(items);
+	}
+}
+
+
+void PackageUpdateList::initItems() {
+	// packages to tree
+	TreeItem root;
+	FOR_EACH(ip, parent->installable_packages) {
+		String group = ip->description->installer_group;
+//%		if (group.empty()) group = _("Custom");
+//%		group += _("/");
+		if (!group.empty()) group += _("/");
+		group += ip->description->short_name;
+		root.add(ip, group);
+	}
+	// tree to treelist items
+	items.clear();
+	root.toItems(items);
+	// init image list
+	images.RemoveAll();
+	Image resampled(16,16,false);
+	FOR_EACH(i,items) {
+		const TreeItem& ti = static_cast<const TreeItem&>(*i);
+		const InstallablePackageP& p = ti.package;
+		if (p && p->description->icon.Ok()) {
+			resample_preserve_aspect(p->description->icon, resampled);
+			images.Add(resampled);
+		} else if (p) {
+			images.Add(load_resource_image(_("installer_package")));
+		} else if (ti.label == _("locales")) {
+			images.Add(load_resource_image(_("installer_locales")));
+		} else {
+			images.Add(load_resource_image(_("installer_group")));
+		}
+	}
+}
+
+void PackageUpdateList::drawItem(DC& dc, size_t index, size_t column, int x, int y, bool selected) const {
+	const TreeItem& ti = static_cast<const TreeItem&>(*items[index]);
+	Color color = wxSystemSettings::GetColour(selected ? wxSYS_COLOUR_HIGHLIGHTTEXT : wxSYS_COLOUR_WINDOWTEXT);
+	if (column == 0) {
+		// Name
+		images.Draw((int)index, dc, x, y);
+		dc.SetTextForeground(color);
+		dc.DrawText(ti.label, x+18, y+2);
+	} else if (column == 1 && ti.package) {
+		// Status
+		int stat = ti.package->status;
+		if ((stat & PACKAGE_CONFLICTS) == PACKAGE_CONFLICTS) {
+			dc.DrawText(_LABEL_("package conflicts"), x+1,y+2);
+		} else if ((stat & PACKAGE_MODIFIED) == PACKAGE_MODIFIED) {
+			dc.DrawText(_LABEL_("package modified"), x+1,y+2);
+		} else if ((stat & PACKAGE_UPDATES) == PACKAGE_UPDATES) {
+			dc.DrawText(_LABEL_("package updates"), x+1,y+2);
+		} else if ((stat & PACKAGE_INSTALLED) == PACKAGE_INSTALLED) {
+			dc.DrawText(_LABEL_("package installed"), x+1,y+2);
+		} else if ((stat & PACKAGE_INSTALLABLE) == PACKAGE_INSTALLABLE) {
+			dc.DrawText(_LABEL_("package installable"), x+1,y+2);
+		}
+	} else if (column == 2 && ti.package) {
+		// Action
+		int act = ti.package->action;
+		if (act & PACKAGE_INSTALL) {
+			dc.DrawText(_LABEL_("install package"), x+1,y+2);
+		} else if (act & PACKAGE_UPGRADE) {
+			dc.DrawText(_LABEL_("upgrade package"), x+1,y+2);
+		} else if (act & PACKAGE_REMOVE) {
+			dc.DrawText(_LABEL_("remove package"), x+1,y+2);
+		}
+	}
+}
+
+String PackageUpdateList::columnText(size_t column) const {
+	if       (column == 0) return _LABEL_("package name");
+	else if  (column == 1) return _LABEL_("package status");
+	else if  (column == 2) return _LABEL_("package action");
+	else                   throw InternalError(_("Unknown column"));
+}
+int PackageUpdateList::columnWidth(size_t column) const {
+	if (column == 0) {
+		wxSize cs = GetClientSize();
+		return cs.x - 300;
+	} else {
+		return 150;
+	}
+}
+
+
+// ----------------------------------------------------------------------------- : PackageInfoPanel
+
+class PackageInfoPanel : public wxPanel {
+  public:
+	PackageInfoPanel(Window* parent);
+	
+	void setPackage(const InstallablePackageP& package);
+	
+	virtual wxSize DoGetBestSize() const;
+  private:
+	InstallablePackageP package;
+	
+	DECLARE_EVENT_TABLE();
+	
+	void onPaint(wxPaintEvent&);
+};
+
+PackageInfoPanel::PackageInfoPanel(Window* parent)
+	: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER)
+{}
+
+void PackageInfoPanel::setPackage(const InstallablePackageP& package) {
+	this->package = package;
+	Refresh(false);
+}
+
+void PackageInfoPanel::onPaint(wxPaintEvent&) {
+	wxBufferedPaintDC dc(this);
+	wxSize cs = GetClientSize();
+	dc.SetPen(*wxTRANSPARENT_PEN);
+	dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+	dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+	dc.DrawRectangle(0,0,cs.x,cs.y);
+	// draw package info
+	if (!package) return;
+	PackageDescription& d = *package->description;
+	int x = 5;
+	if (d.icon.Ok()) {
+		int h = d.icon.GetHeight();
+		int y = max(0,20-h)/2 + 5;
+		dc.DrawBitmap(d.icon, x,y);
+		x += d.icon.GetWidth();
+	}
+	dc.SetFont(wxFont(16, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, _("Arial")));
+	dc.DrawText(d.full_name, x + 5, 3);
+}
+
+wxSize PackageInfoPanel::DoGetBestSize() const {
+	return wxSize(200, 120);
+}
+
+BEGIN_EVENT_TABLE(PackageInfoPanel, wxPanel)
+	EVT_PAINT(PackageInfoPanel::onPaint)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------- : PackagesWindow
+
+PackagesWindow::PackagesWindow(Window* parent, bool download_package_list)
+	: wxDialog(parent, wxID_ANY, _TITLE_("package list"), wxDefaultPosition, wxSize(640,480), wxDEFAULT_DIALOG_STYLE | wxCLIP_CHILDREN | wxRESIZE_BORDER)
+	, where(is_install_local(settings.install_type) ? PACKAGE_LOCAL : PACKAGE_GLOBAL)
+{
+	// get packages
+	wxBusyCursor busy;
+	packages.installedPackages(installable_packages);
+	FOR_EACH(p, installable_packages) p->determineStatus();
+	// ui elements
+	SetIcon(wxIcon());
+	package_list = new PackageUpdateList(this, ID_PACKAGE_LIST);
+	package_info = new PackageInfoPanel(this);
+	
+	//wxToolbar* buttons = new wxToolbar
+	wxButton* install_button = new wxButton(this, ID_INSTALL, _BUTTON_("install package"));
+	wxButton* upgrade_button = new wxButton(this, ID_UPGRADE, _BUTTON_("upgrade package"));
+	wxButton* remove_button  = new wxButton(this, ID_REMOVE,  _BUTTON_("remove package"));
+/*	
+	description_window = new HtmlWindowToBrowser(this, wxID_ANY, wxDefaultPosition, wxSize(540,100), wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
+	setDefaultPackageStatus();
+	
+	(install_button = new wxButton(this, ID_INSTALL, _MENU_("install package")))->Disable();
+	(upgrade_button = new wxButton(this, ID_UPGRADE, _MENU_("upgrade package")))->Disable();
+	(remove_button  = new wxButton(this, ID_REMOVE,  _MENU_("remove package")))->Disable();
+	(cancel_button  = new wxButton(this, ID_CANCEL,  _MENU_("cancel changes")))->Disable();
+
+	apply_button = new wxButton(this, ID_APPLY,   _MENU_("apply changes"));
+	
+	// Init sizer
+	
+	h2->AddStretchSpacer();
+	h2->Add(install_button);
+	h2->AddStretchSpacer();
+	h2->Add(upgrade_button);
+	h2->AddStretchSpacer();
+	h2->Add(remove_button);
+	h2->AddStretchSpacer();
+	h2->Add(cancel_button);
+	h2->AddStretchSpacer();
+*/
+/*	wxBoxSizer *h2 = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer *h3 = new wxBoxSizer(wxHORIZONTAL);
+	
+	h3->AddStretchSpacer();
+	h3->Add(apply_button);
+	h3->AddStretchSpacer();
+//	v->Add(h2);
+//	v->Add(h3);*/
+	
+	wxBoxSizer* v = new wxBoxSizer(wxVERTICAL);
+		v->Add(package_list, 1, wxEXPAND | wxALL & ~wxBOTTOM, 8);
+		v->AddSpacer(4);
+		wxBoxSizer* h = new wxBoxSizer(wxHORIZONTAL);
+			h->Add(package_info, 1, wxRIGHT, 4);
+			wxBoxSizer* v2 = new wxBoxSizer(wxVERTICAL);
+				v2->Add(install_button, 0, wxEXPAND | wxBOTTOM, 4);
+				v2->Add(upgrade_button, 0, wxEXPAND | wxBOTTOM, 4);
+				v2->Add(remove_button,  0, wxEXPAND | wxBOTTOM, 4);
+				v2->AddStretchSpacer();
+			h->Add(v2);
+		v->Add(h, 0, wxEXPAND | wxALL & ~wxTOP, 8);
+		v->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxALL & ~wxTOP, 8);
+	SetSizer(v);
+	
+	UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
+PackagesWindow::~PackagesWindow() {
+	//(new WelcomeWindow)->Show();
+}
+
+/*
+void PackagesWindow::onUpdateCheckFinished(wxCommandEvent&) {
+	setDefaultPackageStatus();
+}*/
+
+void PackagesWindow::onPackageSelect(wxCommandEvent& ev) {
+//	updateButtons(package_list->getSelection());
+	package_info->setPackage(package = package_list->getSelection());
+	UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
+void PackagesWindow::onActionChange(wxCommandEvent& ev) {
+	if (package) {
+		PackageAction act = ev.GetId() == ID_INSTALL ? PACKAGE_INSTALL
+		                  : ev.GetId() == ID_UPGRADE ? PACKAGE_UPGRADE
+		                  : ev.GetId() == ID_REMOVE  ? PACKAGE_REMOVE
+		                  : PACKAGE_NOTHING;
+		act = (PackageAction)(act | where);
+		// toggle action
+		if (package->has(act)) {
+			set_package_action(installable_packages, package, (PackageAction)(PACKAGE_NOTHING | where));
+		} else {
+			set_package_action(installable_packages, package, act);
+		}
+		package_list->Refresh(false);
+		UpdateWindowUI(wxUPDATE_UI_RECURSE);
+	}
+}
+
+void PackagesWindow::onOk(wxCommandEvent& ev) {
+	// Do we need a new version of MSE first?
+	// progress dialog
+	int total = (int)installable_packages.size();
+	wxProgressDialog progress(
+			_TITLE_("installing updates"),
+			String::Format(_ERROR_("downloading updates"), 0, 2*total),
+			total,
+			this,
+			wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_SMOOTH
+		);
+	// Clear package list
+	packages.reset();
+	// Download installers
+	int n = 0;
+	FOR_EACH(ip, installable_packages) {
+		++n;
+		if (!progress.Update(n, String::Format(_ERROR_("downloading updates"), n, total))) {
+			return; // aborted
+		}
+		if ((ip->action & (PACKAGE_INSTALL | PACKAGE_UPGRADE)) && ip->installer && !ip->installer->installer) {
+			// download installer
+			wxURL url(ip->installer->installer_url);
+			wxInputStream* is = url.GetInputStream();
+			if (!is) {
+				throw Error(_ERROR_2_("can't download installer", ip->description->name, ip->installer->installer_url));
+			}
+			ip->installer->installer_file = wxFileName::CreateTempFileName(_("mse-installer"));
+			wxFileOutputStream os(ip->installer->installer_file);
+			os.Write(*is);
+			os.Close();
+			// open installer
+			ip->installer->installer = new_intrusive<Installer>();
+			ip->installer->installer->open(ip->installer->installer_file);
+		}
+	}
+	// Install stuff
+	int n2 = 0 ;
+	FOR_EACH(ip, installable_packages) {
+		++n; ++n2;
+		if (!progress.Update(n, String::Format(_ERROR_("installing updates"), n2, total))) {
+			// don't allow abort.
+		}
+		packages.install(*ip);
+	}
+	// Done
+	wxDialog::OnOK(ev);
+}
+
+void PackagesWindow::onUpdateUI(wxUpdateUIEvent& ev) {
+	switch (ev.GetId()) {
+		case ID_INSTALL:
+		case ID_UPGRADE:
+		case ID_REMOVE: {
+			PackageAction act = ev.GetId() == ID_INSTALL ? PACKAGE_INSTALL
+			                  : ev.GetId() == ID_UPGRADE ? PACKAGE_UPGRADE
+			                  : ev.GetId() == ID_REMOVE  ? PACKAGE_REMOVE
+			                  : PACKAGE_NOTHING;
+			act = (PackageAction)(act | where);
+			ev.Check (package && package->has(act));
+			ev.Enable(package && package->can(act));
+			break;
+		}
+	}
+}
+
+/*
+void PackagesWindow::onActionChange(wxCommandEvent& ev) {
+	PackageVersionDataP pack = package_list->getSelection();
+	if (!pack) return;
+	PackageAction& action = package_data[pack].second;
+	switch (ev.GetId()) {
+		case ID_INSTALL:
+			action = ACTION_INSTALL;
+			SelectPackageDependencies(pack);
+			break;
+		case ID_REMOVE: 
+			action = ACTION_UNINSTALL;
+			RemovePackageDependencies(pack);
+			break;
+		case ID_UPGRADE:
+			action = ACTION_UPGRADE;
+			SelectPackageDependencies(pack);
+			break;
+		case ID_CANCEL:
+			switch (package_data[pack].first) {
+				case STATUS_INSTALLED:
+					SelectPackageDependencies(pack);
+					break;
+				case STATUS_NOT_INSTALLED:
+					RemovePackageDependencies(pack);
+					break;
+				case STATUS_UPGRADEABLE:
+					if (action == ACTION_UPGRADE)
+						DowngradePackageDependencies(pack);
+					else
+						SelectPackageDependencies(pack);
+					break;
+			}
+			action = (pack->app_version > file_version) ? ACTION_NEW_MSE : ACTION_NOTHING;
+			break;
+	}
+	updateButtons(package_list->getSelection());
+	package_list->Refresh();
+}
+
+void PackagesWindow::onApplyChanges(wxCommandEvent& ev) {
+	list<PackageVersionDataP> to_install, to_remove;
+
+	FOR_EACH(pack, update_version_data->packages) {
+		switch (package_data[pack].second) {
+			case ACTION_INSTALL:
+				to_install.push_back(pack);
+				break;
+			case ACTION_UPGRADE:
+				to_install.push_back(pack);
+			case ACTION_UNINSTALL:
+				to_remove.push_back(pack);
+			default:;
+		}
+	}
+
+	FOR_EACH(pack, to_remove) {
+		String filename = packages.openAny(pack->name, true)->absoluteFilename();
+		if (!remove_file_or_dir(filename)) {
+			handle_error(_("Cannot delete ") + filename + _(" to remove package ") + pack->name + _(". ")
+				_("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
+		}
+	}
+
+	FOR_EACH(pack, to_install) {
+		wxURL url(pack->url);
+		wxInputStream* is = url.GetInputStream();
+		if (!is) {
+			handle_error(_("Cannot fetch file ") + pack->url + _(" to install package ") + pack->name + _(". ")
+				_("Other packages may have been installed, including packages that depend on this one. ")
+				_("Please remove those packages manually or install this one manually."));
+		}
+		wxString filename = wxFileName::CreateTempFileName(_(""));
+		wxFileOutputStream os (filename);
+
+		os.Write(*is);
+		os.Close();
+
+		InstallerP inst(new Installer);
+		inst->open(filename);
+		inst->install(isInstallLocal(settings.install_type), false);
+
+		delete is;
+		wxRemoveFile(filename);
+	}
+
+	setDefaultPackageStatus();
+	updateButtons(package_list->getSelection());
+	package_list->Refresh();
+
+	handle_pending_errors();
+
+	packages.clearPackageCache();
+}
+
+void PackagesWindow::updateButtons(const PackageVersionDataP& pack) {
+
+	description_window->SetPage(pack->description);
+
+	PackageStatus status = package_data[pack].first;
+	PackageAction action = package_data[pack].second;
+
+	if (action == ACTION_NEW_MSE) {
+		install_button->Disable();
+		remove_button->Enable(status != STATUS_NOT_INSTALLED);
+		upgrade_button->Disable();
+		cancel_button->Disable();
+	} else if (status == STATUS_INSTALLED) {
+		install_button->Disable();
+		remove_button->Enable(action != ACTION_UNINSTALL);
+		upgrade_button->Disable();
+		cancel_button->Enable(action == ACTION_UNINSTALL);
+	} else if (status == STATUS_NOT_INSTALLED) {
+		install_button->Enable(action != ACTION_INSTALL);
+		remove_button->Disable();
+		upgrade_button->Disable();
+		cancel_button->Enable(action == ACTION_INSTALL);
+	} else /* status == STATUS_UPGRADEABLE * / {
+		install_button->Disable();
+		remove_button->Enable(action != ACTION_UNINSTALL);
+		upgrade_button->Enable(action != ACTION_UPGRADE);
+		cancel_button->Enable(action != ACTION_NOTHING);
+	}
+}
+
+void PackagesWindow::setDefaultPackageStatus() {
+	if (!update_version_data) return;
+	FOR_EACH(p, update_version_data->packages) {
+		PackagedP pack;
+		try { pack = packages.openAny(p->name, true); }
+		catch (PackageNotFoundError&) { } // We couldn't open a package... no cause for alarm
+		
+		if (!pack || !(wxFileExists(pack->absoluteFilename()) || wxDirExists(pack->absoluteFilename()))) {
+			// not installed
+			if (p->app_version > file_version) {
+				package_data[p] = PackageData(STATUS_NOT_INSTALLED, ACTION_NEW_MSE);
+			} else {
+				package_data[p] = PackageData(STATUS_NOT_INSTALLED, ACTION_NOTHING);
+			}
+		} else if (pack->version < p->version) {
+			// newer version
+			if (p->app_version > file_version) {
+				package_data[p] = PackageData(STATUS_UPGRADEABLE, ACTION_NEW_MSE);
+			} else {
+				package_data[p] = PackageData(STATUS_UPGRADEABLE, ACTION_UPGRADE);
+			}
+		} else {
+			package_data[p] = PackageData(STATUS_INSTALLED, ACTION_NOTHING);
+		}
+	}
+}
+
+/// Select the dependencies for a package
+/**
+ *  \param pack The package data to check dependencies for.
+ *
+ *  This function will select all the dependencies for the package, to ensure
+ *  that the user can't install a package without it's dependencies.
+ * /
+void PackagesWindow::SelectPackageDependencies (PackageVersionDataP pack) {
+	FOR_EACH(dep, pack->depends) {
+		if (packages.checkDependency(*dep, false)) //It's already installed.
+			continue;
+		FOR_EACH(p, update_version_data->packages) {
+			if (p->name == dep->package) { //We have a match.
+				if (p->version >= dep->version) { //Versions line up
+
+					PackageStatus& status = package_data[p].first;
+					PackageAction& action = package_data[p].second;
+					if (status == STATUS_NOT_INSTALLED)
+						action = ACTION_INSTALL;
+					else if (status == STATUS_UPGRADEABLE)
+						action = ACTION_UPGRADE;
+					else //status == STATUS_INSTALLED
+						action = ACTION_NOTHING;
+					break;
+				}
+			}
+		}
+		// TODO: Decide what to do if a dependency can't be met.
+		//       It shouldn't happen with a decently maintained updates list.
+		//       But it could, and we need to decide what to do in this situation.
+	}
+}
+
+/// This finds all packages that depend on the one provided and marks them for removal.
+void PackagesWindow::RemovePackageDependencies (PackageVersionDataP pack) {
+	FOR_EACH(p, update_version_data->packages) {
+		FOR_EACH(dep, p->depends) {
+			if (pack->name == dep->package) {
+				PackageStatus& status = package_data[p].first;
+				PackageAction& action = package_data[p].second;
+
+				if (status != STATUS_NOT_INSTALLED)
+					action = ACTION_UNINSTALL;
+				else // status == STATUS_NOT_INSTALLED
+					action = p->app_version > file_version ? ACTION_NEW_MSE : ACTION_NOTHING;
+				break;
+			}
+		}
+	}
+}
+
+/// This deals with the complexities of a downgrade and its dependencies.
+void PackagesWindow::DowngradePackageDependencies (PackageVersionDataP pack) {
+	PackagedP old_pack = packages.openAny(pack->name, true);
+	FOR_EACH(dep, old_pack->dependencies) {
+		// dependencies the old version has, but the new one might not.
+		if (packages.checkDependency(*dep, false)) //It's already installed.
+			continue;
+		FOR_EACH(p, update_version_data->packages) {
+			if (p->name == dep->package) { //We have a match.
+				if (p->version >= dep->version) { //Versions line up
+					if (p->app_version > file_version) //We can't install this
+						continue;
+
+					PackageStatus& status = package_data[p].first;
+					PackageAction& action = package_data[p].second;
+					if (status == STATUS_NOT_INSTALLED)
+						action = ACTION_INSTALL;
+					else if (status == STATUS_UPGRADEABLE)
+						action = ACTION_UPGRADE;
+					break;
+				}
+			}
+		}
+		// TODO: Decide what to do if a dependency can't be met.
+		//       It shouldn't happen with a decently maintained updates list.
+		//       But it could, and we need to decide what to do in this situation.
+		//       Ideally, some sort of error should occur, such that we don't have packages
+		//       with unmet dependencies.
+	}
+
+	FOR_EACH(p, update_version_data->packages) {
+		// dependencies that can no longer be met.
+		FOR_EACH(dep, p->depends) {
+			if (pack->name == dep->package) {
+				if (old_pack->version > dep->version) {
+					PackageStatus& status = package_data[p].first;
+					PackageAction& action = package_data[p].second;
+
+					if (status != STATUS_NOT_INSTALLED)
+						action = ACTION_UNINSTALL;
+					else // status == STATUS_NOT_INSTALLED
+						action = p->app_version > file_version ? ACTION_NEW_MSE : ACTION_NOTHING;
+					break;
+				}
+			}
+		}
+	}
+}
+*/
+
+BEGIN_EVENT_TABLE(PackagesWindow, wxDialog)
+//	EVT_COMMAND(wxID_ANY, UPDATE_CHECK_FINISHED_EVT, PackagesWindow::onUpdateCheckFinished)
+	EVT_LISTBOX(ID_PACKAGE_LIST, PackagesWindow::onPackageSelect)
+	EVT_BUTTON(ID_INSTALL,  PackagesWindow::onActionChange)
+	EVT_BUTTON(ID_REMOVE,   PackagesWindow::onActionChange)
+	EVT_BUTTON(ID_UPGRADE,  PackagesWindow::onActionChange)
+	EVT_BUTTON(wxID_OK,     PackagesWindow::onOk)
+	EVT_UPDATE_UI(wxID_ANY, PackagesWindow::onUpdateUI)
+END_EVENT_TABLE()
diff --git a/src/gui/packages_window.hpp b/src/gui/packages_window.hpp
new file mode 100644
index 00000000..06d09f6d
--- /dev/null
+++ b/src/gui/packages_window.hpp
@@ -0,0 +1,76 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_GUI_PACKAGES_WINDOW
+#define HEADER_GUI_PACKAGES_WINDOW
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+#include <data/installer.hpp>
+// #include <gui/welcome_window.hpp> //???
+
+class PackageUpdateList;
+class PackageInfoPanel;
+//class wxHtmlWindow;
+
+//DECLARE_POINTER_TYPE(PackageVersionData);
+
+//DECLARE_POINTER_TYPE(PackageVersion);
+//DECLARE_POINTER_TYPE(PackageDescription);
+//DECLARE_POINTER_TYPE(InstallableInstaller);
+DECLARE_POINTER_TYPE(InstallablePackage);
+
+// ----------------------------------------------------------------------------- : Available Packages
+
+
+// ----------------------------------------------------------------------------- : Packages window
+
+/// A window that displays the installed packages and updates to them
+class PackagesWindow : public wxDialog {
+  public:
+	PackagesWindow(Window* parent, bool download_package_list = true);
+	~PackagesWindow();
+		
+	InstallablePackages installable_packages;
+	
+  private:
+	PackageUpdateList* package_list; ///< List of available packages
+	PackageInfoPanel*  package_info; ///< Description of the selected package
+	
+	InstallablePackageP package; ///< Selected package
+	PackageAction       where;   ///< Where to install? (PACKAGE_LOCAL or PACKAGE_GLOBAL)
+	
+	DECLARE_EVENT_TABLE();
+	
+	void onOk(wxCommandEvent&);
+	void onActionChange(wxCommandEvent&);
+	void onPackageSelect(wxCommandEvent&);
+	void onUpdateUI(wxUpdateUIEvent&);
+	
+	/*
+	wxHtmlWindow* description_window;
+
+	wxButton *install_button, *upgrade_button, *remove_button, *cancel_button, *apply_button;
+	
+	void onUpdateCheckFinished(wxCommandEvent&);
+	void onPackageSelect(wxCommandEvent&);
+	void onActionChange(wxCommandEvent&);
+	void onApplyChanges(wxCommandEvent&);
+
+	void SelectPackageDependencies   (PackageVersionDataP);
+	void RemovePackageDependencies   (PackageVersionDataP);
+	void DowngradePackageDependencies(PackageVersionDataP);
+
+	/// Update the buttons to indicate that this is selected.
+	void updateButtons(const PackageVersionDataP& pack);
+	
+	void setDefaultPackageStatus();
+	*/
+};
+
+// ----------------------------------------------------------------------------- : EOF
+#endif
diff --git a/src/gui/preferences_window.cpp b/src/gui/preferences_window.cpp
index a889fa38..3e06b75f 100644
--- a/src/gui/preferences_window.cpp
+++ b/src/gui/preferences_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/preferences_window.hpp>
 #include <gui/update_checker.hpp>
 #include <data/settings.hpp>
diff --git a/src/gui/print_window.cpp b/src/gui/print_window.cpp
index 98af46cc..a6848026 100644
--- a/src/gui/print_window.cpp
+++ b/src/gui/print_window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/print_window.hpp>
 #include <gui/card_select_window.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/set/cards_panel.cpp b/src/gui/set/cards_panel.cpp
index 3e0ee24c..b0a083cd 100644
--- a/src/gui/set/cards_panel.cpp
+++ b/src/gui/set/cards_panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/cards_panel.hpp>
 #include <gui/control/image_card_list.hpp>
 #include <gui/control/card_editor.hpp>
diff --git a/src/gui/set/keywords_panel.cpp b/src/gui/set/keywords_panel.cpp
index 6197c83d..04e4ce5e 100644
--- a/src/gui/set/keywords_panel.cpp
+++ b/src/gui/set/keywords_panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/keywords_panel.hpp>
 #include <gui/control/keyword_list.hpp>
 #include <gui/control/text_ctrl.hpp>
diff --git a/src/gui/set/panel.cpp b/src/gui/set/panel.cpp
index 17fb5a41..1dc38723 100644
--- a/src/gui/set/panel.cpp
+++ b/src/gui/set/panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/panel.hpp>
 #include <data/card.hpp>
 
diff --git a/src/gui/set/set_info_panel.cpp b/src/gui/set/set_info_panel.cpp
index 2e3a56fa..adfe6030 100644
--- a/src/gui/set/set_info_panel.cpp
+++ b/src/gui/set/set_info_panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/set_info_panel.hpp>
 #include <gui/control/native_look_editor.hpp>
 #include <gui/icon_menu.hpp>
diff --git a/src/gui/set/stats_panel.cpp b/src/gui/set/stats_panel.cpp
index 7c672719..d832800b 100644
--- a/src/gui/set/stats_panel.cpp
+++ b/src/gui/set/stats_panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/stats_panel.hpp>
 #include <gui/control/graph.hpp>
 #include <gui/control/gallery_list.hpp>
diff --git a/src/gui/set/style_panel.cpp b/src/gui/set/style_panel.cpp
index 10ffa0ed..27d5ea99 100644
--- a/src/gui/set/style_panel.cpp
+++ b/src/gui/set/style_panel.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/style_panel.hpp>
 #include <gui/control/package_list.hpp>
 #include <gui/control/card_viewer.hpp>
diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp
index 60e05bdf..84f55dce 100644
--- a/src/gui/set/window.cpp
+++ b/src/gui/set/window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/set/window.hpp>
 #include <gui/set/panel.hpp>
 #include <gui/set/cards_panel.hpp>
@@ -18,6 +19,7 @@
 #include <gui/control/gallery_list.hpp>
 #include <gui/about_window.hpp>
 #include <gui/update_checker.hpp>
+#include <gui/packages_window.hpp>
 #include <gui/new_window.hpp>
 #include <gui/preferences_window.hpp>
 #include <gui/print_window.hpp>
@@ -538,8 +540,8 @@ void SetWindow::onFileExportMWS(wxCommandEvent&) {
 
 void SetWindow::onFileCheckUpdates(wxCommandEvent&) {
 	if (!askSaveAndContinue()) return;
-	(new UpdatesWindow)->Show();
-	Destroy();
+	(new PackagesWindow(this))->Show();
+	//Destroy();
 }
 
 void SetWindow::onFilePrint(wxCommandEvent&) {
@@ -562,7 +564,7 @@ void SetWindow::onFileReload(wxCommandEvent&) {
 		vector<CardP>::const_iterator card_it = find(set->cards.begin(), set->cards.end(), current_panel->selectedCard());
 		if (card_it != set->cards.end()) card_pos = card_it - set->cards.begin();
 	}
-	packages.destroy(); // unload all packages
+	packages.reset(); // unload all packages
 	settings.read();    // reload settings
 	setSet(import_set(filename));
 	// reselect card
diff --git a/src/gui/symbol/basic_shape_editor.cpp b/src/gui/symbol/basic_shape_editor.cpp
index 747d0672..ad39b0fa 100644
--- a/src/gui/symbol/basic_shape_editor.cpp
+++ b/src/gui/symbol/basic_shape_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/basic_shape_editor.hpp>
 #include <gui/util.hpp>
 #include <util/window_id.hpp>
diff --git a/src/gui/symbol/control.cpp b/src/gui/symbol/control.cpp
index f958f3fb..2a31b967 100644
--- a/src/gui/symbol/control.cpp
+++ b/src/gui/symbol/control.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/control.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/symbol/editor.hpp>
diff --git a/src/gui/symbol/editor.cpp b/src/gui/symbol/editor.cpp
index cb4d91b4..176f6e64 100644
--- a/src/gui/symbol/editor.cpp
+++ b/src/gui/symbol/editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/editor.hpp>
 #include <gui/symbol/window.hpp>
 
diff --git a/src/gui/symbol/part_list.cpp b/src/gui/symbol/part_list.cpp
index 41e7a385..c3c7699b 100644
--- a/src/gui/symbol/part_list.cpp
+++ b/src/gui/symbol/part_list.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/part_list.hpp>
 #include <gui/symbol/selection.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/symbol/point_editor.cpp b/src/gui/symbol/point_editor.cpp
index ca8c01c6..1f0e96e3 100644
--- a/src/gui/symbol/point_editor.cpp
+++ b/src/gui/symbol/point_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/point_editor.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/symbol/select_editor.cpp b/src/gui/symbol/select_editor.cpp
index 10a2aa41..dd9d3209 100644
--- a/src/gui/symbol/select_editor.cpp
+++ b/src/gui/symbol/select_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/select_editor.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/symbol/selection.cpp b/src/gui/symbol/selection.cpp
index 641b9c0d..5f9e0de4 100644
--- a/src/gui/symbol/selection.cpp
+++ b/src/gui/symbol/selection.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/selection.hpp>
 #include <data/symbol.hpp>
 #include <gfx/bezier.hpp>
diff --git a/src/gui/symbol/symmetry_editor.cpp b/src/gui/symbol/symmetry_editor.cpp
index b09902a2..b311a956 100644
--- a/src/gui/symbol/symmetry_editor.cpp
+++ b/src/gui/symbol/symmetry_editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/symmetry_editor.hpp>
 #include <gui/util.hpp>
 #include <util/window_id.hpp>
diff --git a/src/gui/symbol/window.cpp b/src/gui/symbol/window.cpp
index 7382a64e..b1c6adb4 100644
--- a/src/gui/symbol/window.cpp
+++ b/src/gui/symbol/window.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/symbol/control.hpp>
 #include <gui/symbol/part_list.hpp>
diff --git a/src/gui/thumbnail_thread.cpp b/src/gui/thumbnail_thread.cpp
index 754a59fd..d7217356 100644
--- a/src/gui/thumbnail_thread.cpp
+++ b/src/gui/thumbnail_thread.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/thumbnail_thread.hpp>
 #include <util/platform.hpp>
 #include <util/error.hpp>
diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp
index ddeb81df..85105735 100644
--- a/src/gui/update_checker.cpp
+++ b/src/gui/update_checker.cpp
@@ -6,7 +6,9 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/update_checker.hpp>
+#include <gui/packages_window.hpp>
 #include <data/settings.hpp>
 #include <data/installer.hpp>
 #include <util/io/package_manager.hpp>
@@ -17,26 +19,17 @@
 #include <wx/dialup.h>
 #include <wx/url.h>
 #include <wx/html/htmlwin.h>
-#include <wx/vlbox.h>
-#include <wx/wfstream.h>
-#include <wx/dir.h>
-#include <list>
-#include <set>
-#include <iostream>
 
-DECLARE_POINTER_TYPE(PackageVersionData);
-DECLARE_POINTER_TYPE(Installer);
+//%DECLARE_POINTER_TYPE(PackageVersionData);
+
 DECLARE_POINTER_TYPE(VersionData);
-
-DECLARE_TYPEOF_COLLECTION(PackageVersionDataP);
 DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
-DECLARE_TYPEOF(list<PackageVersionDataP>);
-DECLARE_TYPEOF(set<String>);
 
 // ----------------------------------------------------------------------------- : Update data
 
+/*
 /// Information on available packages
-class PackageVersionData : public IntrusivePtrBase<PackageVersionData> {
+class PackageVersionData : public IntrusivePtrVirtualBase {
   public:
 	PackageVersionData() {}
 	
@@ -62,23 +55,39 @@ class VersionData : public IntrusivePtrBase<VersionData> {
 	
 	DECLARE_REFLECTION();
 };
+*/
 
-IMPLEMENT_REFLECTION(PackageVersionData) {
-	REFLECT(name);
-	REFLECT(type);
-	REFLECT(display_name);
-	REFLECT(description);
-	REFLECT(url);
-	REFLECT(version);
-	REFLECT(app_version);
-	REFLECT_N("depends ons", depends);
+/// Information on the latest available versions
+class VersionData : public IntrusivePtrBase<VersionData> {
+  public:
+	vector<PackageDependencyP> packages;  ///< Available packages + versions
+	String  new_updates_url;              ///< updates url has moved?
+	
+	DECLARE_REFLECTION();
+};
+
+/*
+IMPLEMENT_REFLECTION_NO_SCRIPT(PackageVersionData) {
+	REFLECT_NO_SCRIPT(name);
+	REFLECT_NO_SCRIPT(type);
+	REFLECT_NO_SCRIPT(display_name);
+	REFLECT_NO_SCRIPT(description);
+	REFLECT_NO_SCRIPT(url);
+	REFLECT_NO_SCRIPT(version);
+	REFLECT_NO_SCRIPT(app_version);
+	REFLECT_NO_SCRIPT_N("depends ons", depends);
 }
 
-IMPLEMENT_REFLECTION(VersionData) {
-	REFLECT(version);
-	REFLECT(description);
-	REFLECT(new_updates_url);
-	REFLECT(packages);
+IMPLEMENT_REFLECTION_NO_SCRIPT(VersionData) {
+	REFLECT_NO_SCRIPT(version);
+	REFLECT_NO_SCRIPT(description);
+	REFLECT_NO_SCRIPT(new_updates_url);
+	REFLECT_NO_SCRIPT(packages);
+}*/
+
+IMPLEMENT_REFLECTION_NO_SCRIPT(VersionData) {
+	REFLECT_NO_SCRIPT(packages);
+	REFLECT_NO_SCRIPT(new_updates_url);
 }
 
 // The information for the latest version
@@ -89,7 +98,18 @@ bool shown_dialog = false;
 volatile bool checking_updates = false;
 
 bool update_data_found() { return !!update_version_data; }
-bool update_available()  { return update_version_data && update_version_data->version > app_version; }
+bool update_available()  {
+	if (!update_version_data) return false;
+	// updates to any installed package?
+	FOR_EACH_CONST(p, update_version_data->packages) {
+		if (!settings.check_updates_all && p->package != mse_package) continue;
+		Version v;
+		if (packages.installedVersion(p->package, v) && v < p->version) {
+			return true;
+		}
+	}
+	return false;
+}
 
 // ----------------------------------------------------------------------------- : Update checking
 
@@ -113,17 +133,18 @@ class CheckUpdateThread : public wxThread {
 		if (checking_updates) return; // don't check multiple times simultaniously
 		checking_updates = true;
 		try {
-			wxURL url(settings.updates_url);
+			wxURL url(settings.package_versions_url);
 			wxInputStream* isP = url.GetInputStream();
 			if (!isP) return; // failed to get data
 			InputStreamP is(isP);
 			// Read version data
+			// ignore errors for forwards compatability
 			VersionDataP version_data;
-			Reader reader(is, nullptr, _("updates"));
+			Reader reader(is, nullptr, _("updates"), true);
 			reader.handle(version_data);
 			// has the updates url changed?
 			if (!version_data->new_updates_url.empty()) {
-				settings.updates_url = version_data->new_updates_url;
+				settings.package_versions_url = version_data->new_updates_url;
 			}
 			// Make available
 			update_version_data = version_data;
@@ -174,11 +195,14 @@ struct HtmlWindowToBrowser : public wxHtmlWindow {
 
 void show_update_dialog(Window* parent) {
 	if (!update_available() || shown_dialog) return; // we already have the latest version, or this has already been displayed.
+	shown_dialog = true;
+	(new PackagesWindow(parent))->Show();
+	/*
 	// Show update dialog
 	wxDialog* dlg = new wxDialog(parent, wxID_ANY, _TITLE_("updates available"), wxDefaultPosition);
 	// controls
 	wxHtmlWindow* html = new HtmlWindowToBrowser(dlg, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
-	html->SetPage(update_version_data->description);
+//%	html->SetPage(update_version_data->description);
 	wxButton* close = new wxButton(dlg, wxID_OK, _BUTTON_("close"));
 	close->SetDefault();
 	// layout
@@ -189,502 +213,5 @@ void show_update_dialog(Window* parent) {
 	dlg->SetSize(400,400);
 	dlg->Show();
 	// And never show it again this run
-	shown_dialog = true;
+	*/
 }
-
-// ----------------------------------------------------------------------------- : PackageUpdateList
-
-class PackageUpdateList : public wxVListBox {
-  public:
-	PackageUpdateList(UpdatesWindow* parent)
-		: wxVListBox (parent, ID_PACKAGE_LIST, wxDefaultPosition, wxSize(540,210), wxNO_BORDER | wxVSCROLL)
-		, parent(parent)
-	{
-		if (!checking_updates && !update_version_data) {
-			check_updates_now(true);
-		}
-		SetItemCount(update_version_data ? update_version_data->packages.size() : 1);
-	}
-	
-	virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const {
-		static wxBrush greyBrush(Color(224,224,224));
-		if (checking_updates) {
-			String text = _ERROR_("checking updates");
-			
-			dc.SetPen(*wxTRANSPARENT_PEN);
-			dc.SetBrush(greyBrush);
-			dc.DrawRectangle(rect);
-			
-			int w, h;
-			dc.GetTextExtent(text, &w, &h);
-			dc.DrawText(text, rect.GetLeft() + (rect.GetWidth() - w) / 2, rect.GetTop() + (rect.GetHeight() - h) / 2);
-		} else if (!update_version_data || update_version_data->packages.empty()) {
-			String text = _ERROR_("no packages");
-			
-			dc.SetPen(*wxTRANSPARENT_PEN);
-			dc.SetBrush(greyBrush);
-			dc.DrawRectangle(rect);
-			
-			int w, h;
-			dc.GetTextExtent(text, &w, &h);
-			dc.DrawText(text, rect.GetLeft() + (rect.GetWidth() - w) / 2, rect.GetTop() + (rect.GetHeight() - h) / 2);
-		} else {
-			static wxBrush darkBrush(Color(192,224,255));
-			static wxBrush selectBrush(Color(96,96,192));
-			
-			PackageVersionDataP pack = update_version_data->packages[n];
-			UpdatesWindow::PackageStatus status = parent->package_data[pack].first;
-			UpdatesWindow::PackageAction action = parent->package_data[pack].second;
-			
-			dc.SetPen(*wxTRANSPARENT_PEN);
-			dc.SetBrush(IsSelected(n) ? selectBrush : (n % 2 ? *wxWHITE_BRUSH : darkBrush));
-			
-			dc.DrawRectangle(rect);
-			
-			// These two arrays correspond to PackageStatus and PackageAction, respectively
-			static Color status_colors [] = {
-				 Color(32,160,32)
-				,Color(32,32,255)
-				,Color(192,32,32)
-			};
-			
-			static Color action_colors [] = {
-				 Color(32,160,32)
-				,Color(192,32,32)
-				,Color(192,192,32)
-				,Color(32,32,255)
-				,Color(32,32,32)
-			};
-			
-			// Ditto here (these are the locale names)
-			static String status_texts [] = {
-				 _TYPE_("installed")
-				,_TYPE_("uninstalled")
-				,_TYPE_("upgradeable")
-			};
-			
-			static String action_texts [] = {
-				 _TYPE_("install")
-				,_TYPE_("uninstall")
-				,_TYPE_("upgrade")
-				,_TYPE_("do nothing")
-				,_TYPE_("new mse")
-			};
-			
-			static Color packageFront(64,64,64);
-			
-			#define SELECT_WHITE(color) (IsSelected(n) ? *wxWHITE : color)
-			
-			dc.SetClippingRegion(wxRect(rect.x, rect.y, 180, rect.height));
-			dc.SetTextForeground(SELECT_WHITE(packageFront));
-			dc.DrawText(pack->display_name, rect.GetLeft() + 1, rect.GetTop());
-			dc.DestroyClippingRegion();
-			
-			dc.SetClippingRegion(wxRect(rect.x + 180, rect.y, 120, rect.height));
-			dc.DrawText(pack->type, rect.GetLeft() + 180, rect.GetTop());
-			dc.DestroyClippingRegion();
-			
-			dc.SetTextForeground(SELECT_WHITE(status_colors[status]));
-			dc.DrawText(status_texts[status], rect.GetLeft() + 300, rect.GetTop());
-			
-			dc.SetTextForeground(SELECT_WHITE(action_colors[action]));
-			dc.DrawText(action_texts[action], rect.GetLeft() + 420, rect.GetTop());
-			
-			#undef SELECT_WHITE
-		}
-	}
-	
-	virtual wxCoord OnMeasureItem(size_t) const {
-		return (update_version_data && !update_version_data->packages.empty()) ? 15 : 210;
-	}
-	
-	void onUpdateCheckingFinished(wxEvent& event) {
-		SetItemCount(update_version_data ? update_version_data->packages.size() : 1);
-	}
-	
-	virtual wxCoord EstimateTotalHeight() const {
-		return (update_version_data && !update_version_data->packages.empty())
-		           ? 15 * (int)update_version_data->packages.size()
-		           : 210;
-	}
-  private:
-	DECLARE_EVENT_TABLE()
-
-	UpdatesWindow* parent;
-};
-
-BEGIN_EVENT_TABLE(PackageUpdateList, wxVListBox)
-	EVT_CUSTOM(UPDATE_CHECK_FINISHED_EVT, wxID_ANY, PackageUpdateList::onUpdateCheckingFinished)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------- : RecursiveDelete
-// Move somewhere better?
-
-class RecursiveDeleter : public wxDirTraverser {
-	public:
-		set<String> to_delete;
-		String start_dir;
-		RecursiveDeleter (String start)
-		: start_dir (start)
-		{
-			to_delete.insert(start_dir);
-		}
-
-		wxDirTraverseResult OnFile(const String& filename) {
-			if (!wxRemoveFile(filename))
-				handle_error(_("Cannot delete ") + filename + _(". ")
-					_("The remainder of the package has still been removed, if possible.")
-					_("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
-			return wxDIR_CONTINUE;
-		}
-
-		wxDirTraverseResult OnDir(const String& dirname) {
-			to_delete.insert(dirname);
-			return wxDIR_CONTINUE;
-		}
-
-		void finishDelete() {
-			FOR_EACH_REVERSE(dir, to_delete) {
-				wxRmdir(dir);
-			}
-		}
-};
-
-// ----------------------------------------------------------------------------- : UpdateWindow
-
-UpdatesWindow::UpdatesWindow()
-	: Frame(nullptr, wxID_ANY, _TITLE_("package list"), wxDefaultPosition, wxSize(540,440), wxDEFAULT_DIALOG_STYLE | wxCLIP_CHILDREN)
-{
-	SetIcon(wxIcon());
-	wxBoxSizer *v = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer *h1 = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer *h2 = new wxBoxSizer(wxHORIZONTAL);
-	wxBoxSizer *h3 = new wxBoxSizer(wxHORIZONTAL);
-	
-	package_list = new PackageUpdateList(this);
-	description_window = new HtmlWindowToBrowser(this, wxID_ANY, wxDefaultPosition, wxSize(540,100), wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
-	
-	setDefaultPackageStatus();
-	
-	package_title = new wxStaticText(this, wxID_ANY, _TITLE_("package name"),   wxDefaultPosition, wxSize(180,15), wxALIGN_LEFT | wxST_NO_AUTORESIZE);
-	type_title    = new wxStaticText(this, wxID_ANY, _TITLE_("package type"),   wxDefaultPosition, wxSize(120,15), wxALIGN_LEFT | wxST_NO_AUTORESIZE);
-	status_title  = new wxStaticText(this, wxID_ANY, _TITLE_("package status"), wxDefaultPosition, wxSize(120,15), wxALIGN_LEFT | wxST_NO_AUTORESIZE);
-	new_title     = new wxStaticText(this, wxID_ANY, _TITLE_("new status"),     wxDefaultPosition, wxSize(120,15), wxALIGN_LEFT | wxST_NO_AUTORESIZE);
-	
-	h1->Add(package_title, 3);
-	h1->Add(type_title, 2);
-	h1->Add(status_title, 2);
-	h1->Add(new_title, 2);
-	
-	(install_button = new wxButton(this, ID_INSTALL, _MENU_("install package")))->Disable();
-	(upgrade_button = new wxButton(this, ID_UPGRADE, _MENU_("upgrade package")))->Disable();
-	(remove_button  = new wxButton(this, ID_REMOVE,  _MENU_("remove package")))->Disable();
-	(cancel_button  = new wxButton(this, ID_CANCEL,  _MENU_("cancel changes")))->Disable();
-
-	apply_button = new wxButton(this, ID_APPLY,   _MENU_("apply changes"));
-	
-	h2->AddStretchSpacer();
-	h2->Add(install_button);
-	h2->AddStretchSpacer();
-	h2->Add(upgrade_button);
-	h2->AddStretchSpacer();
-	h2->Add(remove_button);
-	h2->AddStretchSpacer();
-	h2->Add(cancel_button);
-	h2->AddStretchSpacer();
-
-	h3->AddStretchSpacer();
-	h3->Add(apply_button);
-	h3->AddStretchSpacer();
-	
-	v->Add(h1);
-	v->Add(package_list);
-	v->AddStretchSpacer(2);
-	v->Add(description_window);
-	v->AddStretchSpacer(2);
-	v->Add(h2);
-	v->AddStretchSpacer(1);
-	v->Add(h3);
-	v->AddStretchSpacer(2);
-	
-	SetSizer(v);
-}
-
-UpdatesWindow::~UpdatesWindow() {
-	(new WelcomeWindow)->Show();
-}
-
-void UpdatesWindow::onUpdateCheckFinished(wxCommandEvent&) {
-	setDefaultPackageStatus();
-}
-
-void UpdatesWindow::onPackageSelect(wxCommandEvent& ev) {
-	updateButtons(ev.GetInt());
-}
-
-void UpdatesWindow::onActionChange(wxCommandEvent& ev) {
-	PackageVersionDataP pack = update_version_data->packages[package_list->GetSelection()];
-	PackageAction& action = package_data[pack].second;
-	switch (ev.GetId()) {
-		case ID_INSTALL:
-			action = ACTION_INSTALL;
-			SelectPackageDependencies(pack);
-			break;
-		case ID_REMOVE: 
-			action = ACTION_UNINSTALL;
-			RemovePackageDependencies(pack);
-			break;
-		case ID_UPGRADE:
-			action = ACTION_UPGRADE;
-			SelectPackageDependencies(pack);
-			break;
-		case ID_CANCEL:
-			switch (package_data[pack].first) {
-				case STATUS_INSTALLED:
-					SelectPackageDependencies(pack);
-					break;
-				case STATUS_NOT_INSTALLED:
-					RemovePackageDependencies(pack);
-					break;
-				case STATUS_UPGRADEABLE:
-					if (action == ACTION_UPGRADE)
-						DowngradePackageDependencies(pack);
-					else
-						SelectPackageDependencies(pack);
-					break;
-			}
-			action = (pack->app_version > file_version) ? ACTION_NEW_MSE : ACTION_NOTHING;
-			break;
-	}
-	updateButtons(package_list->GetSelection());
-	package_list->Refresh();
-}
-
-void UpdatesWindow::onApplyChanges(wxCommandEvent& ev) {
-	list<PackageVersionDataP> to_install, to_remove;
-
-	FOR_EACH(pack, update_version_data->packages) {
-		switch (package_data[pack].second) {
-			case ACTION_INSTALL:
-				to_install.push_back(pack);
-				break;
-			case ACTION_UPGRADE:
-				to_install.push_back(pack);
-			case ACTION_UNINSTALL:
-				to_remove.push_back(pack);
-			default:;
-		}
-	}
-
-	FOR_EACH(pack, to_remove) {
-		String filename = packages.openAny(pack->name, true)->absoluteFilename();
-		if (wxDirExists(filename)) {
-			wxDir dir(filename);
-			RecursiveDeleter rd (filename);
-			dir.Traverse(rd);
-			rd.finishDelete();
-		} else {
-			if (!wxRemoveFile(filename))
-				handle_error(_("Cannot delete ") + filename + _(" to remove package ") + pack->name + _(". ")
-					_("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
-		}
-	}
-
-	FOR_EACH(pack, to_install) {
-		wxURL url(pack->url);
-		wxInputStream* is = url.GetInputStream();
-		if (!is) {
-			handle_error(_("Cannot fetch file ") + pack->url + _(" to install package ") + pack->name + _(". ")
-				_("Other packages may have been installed, including packages that depend on this one. ")
-				_("Please remove those packages manually or install this one manually."));
-		}
-		wxString filename = wxFileName::CreateTempFileName(_(""));
-		wxFileOutputStream os (filename);
-
-		os.Write(*is);
-		os.Close();
-
-		InstallerP inst(new Installer);
-		inst->open(filename);
-		inst->install(isInstallLocal(settings.install_type), false);
-
-		delete is;
-		wxRemoveFile(filename);
-	}
-
-	setDefaultPackageStatus();
-	updateButtons(package_list->GetSelection());
-	package_list->Refresh();
-
-	handle_pending_errors();
-
-	packages.clearPackageCache();
-}
-
-void UpdatesWindow::updateButtons(int id) {
-	PackageVersionDataP pack = update_version_data->packages[id];
-
-	description_window->SetPage(pack->description);
-
-	PackageStatus status = package_data[pack].first;
-	PackageAction action = package_data[pack].second;
-
-	if (action == ACTION_NEW_MSE) {
-		install_button->Disable();
-		remove_button->Enable(status != STATUS_NOT_INSTALLED);
-		upgrade_button->Disable();
-		cancel_button->Disable();
-	} else if (status == STATUS_INSTALLED) {
-		install_button->Disable();
-		remove_button->Enable(action != ACTION_UNINSTALL);
-		upgrade_button->Disable();
-		cancel_button->Enable(action == ACTION_UNINSTALL);
-	} else if (status == STATUS_NOT_INSTALLED) {
-		install_button->Enable(action != ACTION_INSTALL);
-		remove_button->Disable();
-		upgrade_button->Disable();
-		cancel_button->Enable(action == ACTION_INSTALL);
-	} else /* status == STATUS_UPGRADEABLE */ {
-		install_button->Disable();
-		remove_button->Enable(action != ACTION_UNINSTALL);
-		upgrade_button->Enable(action != ACTION_UPGRADE);
-		cancel_button->Enable(action != ACTION_NOTHING);
-	}
-}
-
-void UpdatesWindow::setDefaultPackageStatus() {
-	if (!update_version_data) return;
-	FOR_EACH(p, update_version_data->packages) {
-		PackagedP pack;
-		try { pack = packages.openAny(p->name, true); }
-		catch (PackageNotFoundError&) { } // We couldn't open a package... no cause for alarm
-		
-		if (!pack || !(wxFileExists(pack->absoluteFilename()) || wxDirExists(pack->absoluteFilename()))) {
-			// not installed
-			if (p->app_version > file_version) {
-				package_data[p] = PackageData(STATUS_NOT_INSTALLED, ACTION_NEW_MSE);
-			} else {
-				package_data[p] = PackageData(STATUS_NOT_INSTALLED, ACTION_NOTHING);
-			}
-		} else if (pack->version < p->version) {
-			// newer version
-			if (p->app_version > file_version) {
-				package_data[p] = PackageData(STATUS_UPGRADEABLE, ACTION_NEW_MSE);
-			} else {
-				package_data[p] = PackageData(STATUS_UPGRADEABLE, ACTION_UPGRADE);
-			}
-		} else {
-			package_data[p] = PackageData(STATUS_INSTALLED, ACTION_NOTHING);
-		}
-	}
-}
-
-/// Select the dependencies for a package
-/**
- *  \param pack The package data to check dependencies for.
- *
- *  This function will select all the dependencies for the package, to ensure
- *  that the user can't install a package without it's dependencies.
- */
-void UpdatesWindow::SelectPackageDependencies (PackageVersionDataP pack) {
-	FOR_EACH(dep, pack->depends) {
-		if (packages.checkDependency(*dep, false)) //It's already installed.
-			continue;
-		FOR_EACH(p, update_version_data->packages) {
-			if (p->name == dep->package) { //We have a match.
-				if (p->version >= dep->version) { //Versions line up
-
-					PackageStatus& status = package_data[p].first;
-					PackageAction& action = package_data[p].second;
-					if (status == STATUS_NOT_INSTALLED)
-						action = ACTION_INSTALL;
-					else if (status == STATUS_UPGRADEABLE)
-						action = ACTION_UPGRADE;
-					else //status == STATUS_INSTALLED
-						action = ACTION_NOTHING;
-					break;
-				}
-			}
-		}
-		// TODO: Decide what to do if a dependency can't be met.
-		//       It shouldn't happen with a decently maintained updates list.
-		//       But it could, and we need to decide what to do in this situation.
-	}
-}
-
-/// This finds all packages that depend on the one provided and marks them for removal.
-void UpdatesWindow::RemovePackageDependencies (PackageVersionDataP pack) {
-	FOR_EACH(p, update_version_data->packages) {
-		FOR_EACH(dep, p->depends) {
-			if (pack->name == dep->package) {
-				PackageStatus& status = package_data[p].first;
-				PackageAction& action = package_data[p].second;
-
-				if (status != STATUS_NOT_INSTALLED)
-					action = ACTION_UNINSTALL;
-				else // status == STATUS_NOT_INSTALLED
-					action = p->app_version > file_version ? ACTION_NEW_MSE : ACTION_NOTHING;
-				break;
-			}
-		}
-	}
-}
-
-/// This deals with the complexities of a downgrade and its dependencies.
-void UpdatesWindow::DowngradePackageDependencies (PackageVersionDataP pack) {
-	PackagedP old_pack = packages.openAny(pack->name, true);
-	FOR_EACH(dep, old_pack->dependencies) {
-		// dependencies the old version has, but the new one might not.
-		if (packages.checkDependency(*dep, false)) //It's already installed.
-			continue;
-		FOR_EACH(p, update_version_data->packages) {
-			if (p->name == dep->package) { //We have a match.
-				if (p->version >= dep->version) { //Versions line up
-					if (p->app_version > file_version) //We can't install this
-						continue;
-
-					PackageStatus& status = package_data[p].first;
-					PackageAction& action = package_data[p].second;
-					if (status == STATUS_NOT_INSTALLED)
-						action = ACTION_INSTALL;
-					else if (status == STATUS_UPGRADEABLE)
-						action = ACTION_UPGRADE;
-					break;
-				}
-			}
-		}
-		// TODO: Decide what to do if a dependency can't be met.
-		//       It shouldn't happen with a decently maintained updates list.
-		//       But it could, and we need to decide what to do in this situation.
-		//       Ideally, some sort of error should occur, such that we don't have packages
-		//       with unmet dependencies.
-	}
-
-	FOR_EACH(p, update_version_data->packages) {
-		// dependencies that can no longer be met.
-		FOR_EACH(dep, p->depends) {
-			if (pack->name == dep->package) {
-				if (old_pack->version > dep->version) {
-					PackageStatus& status = package_data[p].first;
-					PackageAction& action = package_data[p].second;
-
-					if (status != STATUS_NOT_INSTALLED)
-						action = ACTION_UNINSTALL;
-					else // status == STATUS_NOT_INSTALLED
-						action = p->app_version > file_version ? ACTION_NEW_MSE : ACTION_NOTHING;
-					break;
-				}
-			}
-		}
-	}
-}
-
-BEGIN_EVENT_TABLE(UpdatesWindow, Frame)
-	EVT_COMMAND(wxID_ANY, UPDATE_CHECK_FINISHED_EVT, UpdatesWindow::onUpdateCheckFinished)
-	EVT_LISTBOX(ID_PACKAGE_LIST, UpdatesWindow::onPackageSelect)
-	EVT_BUTTON(ID_INSTALL, UpdatesWindow::onActionChange)
-	EVT_BUTTON(ID_REMOVE,  UpdatesWindow::onActionChange)
-	EVT_BUTTON(ID_UPGRADE, UpdatesWindow::onActionChange)
-	EVT_BUTTON(ID_CANCEL,  UpdatesWindow::onActionChange)
-	EVT_BUTTON(ID_APPLY,   UpdatesWindow::onApplyChanges)
-END_EVENT_TABLE()
diff --git a/src/gui/update_checker.hpp b/src/gui/update_checker.hpp
index c7e9f0bc..1b3b931e 100644
--- a/src/gui/update_checker.hpp
+++ b/src/gui/update_checker.hpp
@@ -10,7 +10,6 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
-#include <gui/welcome_window.hpp>
 
 // ----------------------------------------------------------------------------- : Update checking
 
@@ -27,63 +26,6 @@ void check_updates_now(bool async = true);
  *  Call this function from an onIdle loop */
 void show_update_dialog(Window* parent);
 
-// ----------------------------------------------------------------------------- : Update window
-
-class PackageUpdateList;
-class wxHtmlWindow;
-
-DECLARE_POINTER_TYPE(PackageVersionData);
-
-/// A window that displays the updates and allows the user to select some.
-/** NOTE: cannot be called 'UpdateWindow' because there is a Win32 function with that name
- */
-class UpdatesWindow : public Frame {
-  public:
-	UpdatesWindow();
-	~UpdatesWindow();
-	
-	void DrawTitles(wxPaintEvent&);
-
-	enum PackageStatus {
-		STATUS_INSTALLED,
-		STATUS_NOT_INSTALLED,
-		STATUS_UPGRADEABLE
-	};
-	enum PackageAction {
-		ACTION_INSTALL,
-		ACTION_UNINSTALL,
-		ACTION_UPGRADE,
-		ACTION_NOTHING,
-		ACTION_NEW_MSE // means that you need a new version of MSE to install/upgrade
-	};
-
-	typedef pair<PackageStatus, PackageAction> PackageData;
-
-	map<PackageVersionDataP, PackageData> package_data;
-
-  private:
-	DECLARE_EVENT_TABLE();
-	PackageUpdateList* package_list; ///< List of available packages
-	wxHtmlWindow* description_window;
-
-	wxStaticText *package_title, *type_title, *status_title, *new_title;
-	wxButton *install_button, *upgrade_button, *remove_button, *cancel_button, *apply_button;
-	
-	void onUpdateCheckFinished(wxCommandEvent&);
-	void onPackageSelect(wxCommandEvent&);
-	void onActionChange(wxCommandEvent&);
-	void onApplyChanges(wxCommandEvent&);
-
-	void SelectPackageDependencies   (PackageVersionDataP);
-	void RemovePackageDependencies   (PackageVersionDataP);
-	void DowngradePackageDependencies(PackageVersionDataP);
-
-	/// Update the buttons to indicate that this is selected.
-	void updateButtons(int index);
-	
-	void setDefaultPackageStatus();
-};
-
 /// Was update data found?
 bool update_data_found();
 /// Is there an update?
diff --git a/src/gui/util.cpp b/src/gui/util.cpp
index cd675112..e824beb3 100644
--- a/src/gui/util.cpp
+++ b/src/gui/util.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/util.hpp>
 #include <util/error.hpp>
 #include <util/rotation.hpp>
diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index a2b8fc0c..903192b8 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/choice.hpp>
 #include <gui/util.hpp>
 #include <gui/thumbnail_thread.hpp>
diff --git a/src/gui/value/color.cpp b/src/gui/value/color.cpp
index 7534b383..c77a6194 100644
--- a/src/gui/value/color.cpp
+++ b/src/gui/value/color.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/color.hpp>
 #include <gui/drop_down_list.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/value/editor.cpp b/src/gui/value/editor.cpp
index 1dd66f00..4894731a 100644
--- a/src/gui/value/editor.cpp
+++ b/src/gui/value/editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 //#include <gui/value/editor.hpp>
 
 // ----------------------------------------------------------------------------- : ValueEditor
diff --git a/src/gui/value/image.cpp b/src/gui/value/image.cpp
index 6191fb95..aca95994 100644
--- a/src/gui/value/image.cpp
+++ b/src/gui/value/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/image.hpp>
 #include <gui/image_slice_window.hpp>
 #include <data/format/clipboard.hpp>
diff --git a/src/gui/value/information.cpp b/src/gui/value/information.cpp
index d4cf1b45..5c5f96b8 100644
--- a/src/gui/value/information.cpp
+++ b/src/gui/value/information.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/information.hpp>
 
 // ----------------------------------------------------------------------------- : InfoValueEditor
diff --git a/src/gui/value/multiple_choice.cpp b/src/gui/value/multiple_choice.cpp
index e5a32064..367e2415 100644
--- a/src/gui/value/multiple_choice.cpp
+++ b/src/gui/value/multiple_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/multiple_choice.hpp>
 #include <gui/thumbnail_thread.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/value/package_choice.cpp b/src/gui/value/package_choice.cpp
index 2ce9e39a..095b5c77 100644
--- a/src/gui/value/package_choice.cpp
+++ b/src/gui/value/package_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/package_choice.hpp>
 #include <gui/drop_down_list.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/value/symbol.cpp b/src/gui/value/symbol.cpp
index 3bfb3d3c..617c5197 100644
--- a/src/gui/value/symbol.cpp
+++ b/src/gui/value/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/symbol.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/value/text.cpp b/src/gui/value/text.cpp
index b31e278b..7b4c5095 100644
--- a/src/gui/value/text.cpp
+++ b/src/gui/value/text.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/value/text.hpp>
 #include <gui/icon_menu.hpp>
 #include <gui/util.hpp>
diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp
index 67414e43..726bb1c0 100644
--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -6,11 +6,13 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <gui/welcome_window.hpp>
 #include <gui/util.hpp>
 #include <gui/new_window.hpp>
 #include <gui/set/window.hpp>
 #include <gui/update_checker.hpp>
+#include <gui/packages_window.hpp>
 #include <util/window_id.hpp>
 #include <data/settings.hpp>
 #include <data/format/formats.hpp>
@@ -23,7 +25,7 @@
 // ----------------------------------------------------------------------------- : WelcomeWindow
 
 WelcomeWindow::WelcomeWindow()
-	: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,340), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
+	: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
 	, logo (load_resource_image(_("about")))
 	, logo2(load_resource_image(_("two_beta")))
 {
@@ -31,9 +33,9 @@ WelcomeWindow::WelcomeWindow()
 	
 	// init controls
 	#ifdef USE_HOVERBUTTON
-		wxControl* new_set   = new HoverButtonExt(this, ID_FILE_NEW,           load_resource_image(_("welcome_new")),  _BUTTON_("new set"),       _HELP_("new set"));	
-		wxControl* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,          load_resource_image(_("welcome_open")), _BUTTON_("open set"),      _HELP_("open set"));
-		wxControl* updates   = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, wxImage(),                              _BUTTON_("check updates"), _HELP_("check updates"));
+		wxControl* new_set   = new HoverButtonExt(this, ID_FILE_NEW,           load_resource_image(_("welcome_new")),     _BUTTON_("new set"),       _HELP_("new set"));	
+		wxControl* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,          load_resource_image(_("welcome_open")),    _BUTTON_("open set"),      _HELP_("open set"));
+		wxControl* updates   = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, load_resource_image(_("welcome_updates")), _BUTTON_("check updates"), _HELP_("check updates"));
 	#else
 		wxControl* new_set   = new wxButton(this, ID_FILE_NEW,           _BUTTON_("new set"));
 		wxControl* open_set  = new wxButton(this, ID_FILE_OPEN,          _BUTTON_("open set"));
@@ -106,7 +108,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) {
 }
 
 void WelcomeWindow::onCheckUpdates(wxCommandEvent&) {
-	(new UpdatesWindow)->Show();
+	(new PackagesWindow(nullptr))->Show();
 	Close();
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 1542d1c7..be5b552f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -108,7 +108,7 @@ int MSE::OnRun() {
 							parse_enum(String(argv[2]).substr(2), type);
 						}
 					}
-					Installer::installFrom(argv[1], true, isInstallLocal(type));
+//%%%					Installer::installFrom(argv[1], true, isInstallLocal(type));
 					return EXIT_SUCCESS;
 				} else if (arg == _("--symbol-editor")) {
 					Window* wnd = new SymbolWindow(nullptr);
diff --git a/src/mse.vcproj b/src/mse.vcproj
index 8f519a74..3eec285e 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="mse"
 	ProjectGUID="{DB9DCD62-4679-47DD-8BEE-8A0191161A51}"
+	RootNamespace="mse"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -26,9 +27,9 @@
 				RuntimeLibrary="5"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerListingLocation="$(OutDir)"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				BrowseInformation="1"
@@ -98,9 +99,9 @@
 				BufferSecurityCheck="FALSE"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerListingLocation="$(OutDir)"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				WarningLevel="3"
@@ -165,9 +166,9 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerListingLocation="$(OutDir)"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				BrowseInformation="1"
@@ -239,9 +240,9 @@
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerListingLocation="$(OutDir)"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				WarningLevel="3"
@@ -315,9 +316,9 @@
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerListingLocation="$(OutDir)"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				WarningLevel="3"
@@ -391,9 +392,9 @@
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="util/prec.hpp"
-				PrecompiledHeaderFile=""
+				PrecompiledHeaderFile="$(IntDir)/mse.pch"
 				AssemblerOutput="4"
 				AssemblerListingLocation="$(OutDir)/"
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
@@ -2305,6 +2306,12 @@
 					<File
 						RelativePath=".\util\dynamic_arg.hpp">
 					</File>
+					<File
+						RelativePath=".\util\file_utils.cpp">
+					</File>
+					<File
+						RelativePath=".\util\file_utils.hpp">
+					</File>
 					<File
 						RelativePath=".\util\order_cache.hpp">
 					</File>
@@ -3341,28 +3348,44 @@
 		</Filter>
 		<File
 			RelativePath=".\code_template.cpp">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
 					ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Unicode|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Unicode|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
 					ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Profile Unicode|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
 					ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Unicode fast build|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
 					ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 			</FileConfiguration>
 		</File>
diff --git a/src/render/card/viewer.cpp b/src/render/card/viewer.cpp
index 61aa68fc..a1d090a1 100644
--- a/src/render/card/viewer.cpp
+++ b/src/render/card/viewer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/card/viewer.hpp>
 #include <render/value/viewer.hpp>
 #include <data/set.hpp>
diff --git a/src/render/symbol/filter.cpp b/src/render/symbol/filter.cpp
index c3a38680..bdf027af 100644
--- a/src/render/symbol/filter.cpp
+++ b/src/render/symbol/filter.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/symbol/filter.hpp>
 #include <render/symbol/viewer.hpp>
 #include <gfx/gfx.hpp>
diff --git a/src/render/symbol/viewer.cpp b/src/render/symbol/viewer.cpp
index de73c7c7..49b31cfd 100644
--- a/src/render/symbol/viewer.cpp
+++ b/src/render/symbol/viewer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/symbol/viewer.hpp>
 #include <util/error.hpp> // clearDC_black
 #include <gui/util.hpp> // clearDC_black
diff --git a/src/render/text/compound.cpp b/src/render/text/compound.cpp
index 69be2e5d..2d15acda 100644
--- a/src/render/text/compound.cpp
+++ b/src/render/text/compound.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/text/element.hpp>
 
 // ----------------------------------------------------------------------------- : CompoundTextElement
diff --git a/src/render/text/element.cpp b/src/render/text/element.cpp
index 57b07243..8ebadf53 100644
--- a/src/render/text/element.cpp
+++ b/src/render/text/element.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/text/element.hpp>
 #include <util/tagged_string.hpp>
 #include <data/field/text.hpp>
diff --git a/src/render/text/font.cpp b/src/render/text/font.cpp
index 7941c50f..cf748ee4 100644
--- a/src/render/text/font.cpp
+++ b/src/render/text/font.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/text/element.hpp>
 #include <data/font.hpp>
 
diff --git a/src/render/text/symbol.cpp b/src/render/text/symbol.cpp
index d651a57f..bfe019f7 100644
--- a/src/render/text/symbol.cpp
+++ b/src/render/text/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/text/element.hpp>
 #include <data/symbol_font.hpp>
 
diff --git a/src/render/text/viewer.cpp b/src/render/text/viewer.cpp
index 211bbd50..971e2d9b 100644
--- a/src/render/text/viewer.cpp
+++ b/src/render/text/viewer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/text/viewer.hpp>
 #include <algorithm>
 
diff --git a/src/render/value/choice.cpp b/src/render/value/choice.cpp
index a7091e54..d404b80d 100644
--- a/src/render/value/choice.cpp
+++ b/src/render/value/choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/choice.hpp>
 #include <render/card/viewer.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/render/value/color.cpp b/src/render/value/color.cpp
index 2fa45627..892cefc8 100644
--- a/src/render/value/color.cpp
+++ b/src/render/value/color.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/color.hpp>
 #include <render/card/viewer.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/render/value/image.cpp b/src/render/value/image.cpp
index 9ba0c8bb..86843c36 100644
--- a/src/render/value/image.cpp
+++ b/src/render/value/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/image.hpp>
 #include <render/card/viewer.hpp>
 #include <data/set.hpp>
diff --git a/src/render/value/information.cpp b/src/render/value/information.cpp
index e99817fb..018b65c4 100644
--- a/src/render/value/information.cpp
+++ b/src/render/value/information.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/information.hpp>
 #include <render/card/viewer.hpp>
 
diff --git a/src/render/value/multiple_choice.cpp b/src/render/value/multiple_choice.cpp
index ed32bb8a..500263b5 100644
--- a/src/render/value/multiple_choice.cpp
+++ b/src/render/value/multiple_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/multiple_choice.hpp>
 #include <render/value/choice.hpp>
 #include <render/card/viewer.hpp>
diff --git a/src/render/value/package_choice.cpp b/src/render/value/package_choice.cpp
index d3f52238..b6d0f24d 100644
--- a/src/render/value/package_choice.cpp
+++ b/src/render/value/package_choice.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/package_choice.hpp>
 #include <util/io/package_manager.hpp>
 
diff --git a/src/render/value/symbol.cpp b/src/render/value/symbol.cpp
index e00f1a2f..df4091ca 100644
--- a/src/render/value/symbol.cpp
+++ b/src/render/value/symbol.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/symbol.hpp>
 #include <render/symbol/filter.hpp>
 #include <data/set.hpp>
diff --git a/src/render/value/text.cpp b/src/render/value/text.cpp
index 4dd76eaa..7ba17058 100644
--- a/src/render/value/text.cpp
+++ b/src/render/value/text.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/text.hpp>
 #include <render/card/viewer.hpp>
 #include <data/stylesheet.hpp>
diff --git a/src/render/value/viewer.cpp b/src/render/value/viewer.cpp
index 4113c255..a360440f 100644
--- a/src/render/value/viewer.cpp
+++ b/src/render/value/viewer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <render/value/viewer.hpp>
 #include <render/card/viewer.hpp>
 
diff --git a/src/resource/common/expected_locale_keys b/src/resource/common/expected_locale_keys
index 21f1422b..dfb7f594 100644
--- a/src/resource/common/expected_locale_keys
+++ b/src/resource/common/expected_locale_keys
@@ -273,6 +273,8 @@ label:
 	styling options:	0
 	uses:	0
 	zoom:	0
+	package name: 0
+	package status: 0
 menu:
 	about:	0
 	add card:	0
diff --git a/src/resource/common/installer_font.png b/src/resource/common/installer_font.png
new file mode 100644
index 00000000..b7960db9
Binary files /dev/null and b/src/resource/common/installer_font.png differ
diff --git a/src/resource/common/installer_group.png b/src/resource/common/installer_group.png
new file mode 100644
index 00000000..fb6d8bbf
Binary files /dev/null and b/src/resource/common/installer_group.png differ
diff --git a/src/resource/common/installer_locales.png b/src/resource/common/installer_locales.png
new file mode 100644
index 00000000..f021c3e1
Binary files /dev/null and b/src/resource/common/installer_locales.png differ
diff --git a/src/resource/common/installer_package.png b/src/resource/common/installer_package.png
new file mode 100644
index 00000000..efd0a4f3
Binary files /dev/null and b/src/resource/common/installer_package.png differ
diff --git a/src/resource/common/welcome_updates.png b/src/resource/common/welcome_updates.png
new file mode 100644
index 00000000..c67d9a6a
Binary files /dev/null and b/src/resource/common/welcome_updates.png differ
diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
index e1414163..fc27744f 100644
--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -165,9 +165,15 @@ btn_expand_down			IMAGE	"../common/btn_expand_down.png"
 welcome_new				IMAGE	"../common/welcome_new.png"
 welcome_open			IMAGE	"../common/welcome_open.png"
 welcome_last			IMAGE	"../common/welcome_last.png"
+welcome_updates			IMAGE	"../common/welcome_updates.png"
 
 edit_symbol				IMAGE	"../common/edit_symbol.png"
 
+installer_group			IMAGE	"../common/installer_group.png"
+installer_package		IMAGE	"../common/installer_package.png"
+installer_locales		IMAGE	"../common/installer_locales.png"
+//installer_font		IMAGE	"../common/installer_font.png"
+
 // -------------------------------------------------------- : WX
 
 wxBITMAP_STD_COLOURS	BITMAP "wx/msw/colours.bmp"
diff --git a/src/script/context.cpp b/src/script/context.cpp
index 56365c01..48e235a1 100644
--- a/src/script/context.cpp
+++ b/src/script/context.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/context.hpp>
 #include <script/to_value.hpp>
 #include <util/error.hpp>
diff --git a/src/script/dependency.cpp b/src/script/dependency.cpp
index eaec2716..ca3df834 100644
--- a/src/script/dependency.cpp
+++ b/src/script/dependency.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/context.hpp>
 #include <script/to_value.hpp>
 #include <util/error.hpp>
diff --git a/src/script/functions/basic.cpp b/src/script/functions/basic.cpp
index f54f40ed..8f537f3e 100644
--- a/src/script/functions/basic.cpp
+++ b/src/script/functions/basic.cpp
@@ -7,6 +7,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/functions/functions.hpp>
 #include <script/functions/util.hpp>
 #include <util/tagged_string.hpp>
diff --git a/src/script/functions/editor.cpp b/src/script/functions/editor.cpp
index e6b3f7b3..b365188b 100644
--- a/src/script/functions/editor.cpp
+++ b/src/script/functions/editor.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/functions/functions.hpp>
 #include <script/functions/util.hpp>
 #include <util/tagged_string.hpp>
diff --git a/src/script/functions/english.cpp b/src/script/functions/english.cpp
index c5a867a1..4f14d3c3 100644
--- a/src/script/functions/english.cpp
+++ b/src/script/functions/english.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/functions/functions.hpp>
 #include <script/functions/util.hpp>
 #include <util/tagged_string.hpp>
diff --git a/src/script/functions/export.cpp b/src/script/functions/export.cpp
index 2644a81a..76dc579e 100644
--- a/src/script/functions/export.cpp
+++ b/src/script/functions/export.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/functions/functions.hpp>
 #include <script/functions/util.hpp>
 #include <script/image.hpp>
diff --git a/src/script/functions/image.cpp b/src/script/functions/image.cpp
index 716527e1..f29bf60d 100644
--- a/src/script/functions/image.cpp
+++ b/src/script/functions/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/functions/functions.hpp>
 #include <script/functions/util.hpp>
 #include <script/image.hpp>
diff --git a/src/script/image.cpp b/src/script/image.cpp
index b58a6cbd..c79515c9 100644
--- a/src/script/image.cpp
+++ b/src/script/image.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/image.hpp>
 #include <script/context.hpp>
 #include <script/to_value.hpp>
diff --git a/src/script/parser.cpp b/src/script/parser.cpp
index 59275913..f0675cb8 100644
--- a/src/script/parser.cpp
+++ b/src/script/parser.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/script.hpp>
 #include <script/parser.hpp>
 #include <script/to_value.hpp>
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 663f2c0d..22dbc0f0 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/script.hpp>
 #include <script/context.hpp>
 #include <script/to_value.hpp>
diff --git a/src/script/script_manager.cpp b/src/script/script_manager.cpp
index 33441c1c..e25f05c3 100644
--- a/src/script/script_manager.cpp
+++ b/src/script/script_manager.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/script_manager.hpp>
 #include <script/to_value.hpp>
 #include <script/functions/functions.hpp>
diff --git a/src/script/scriptable.cpp b/src/script/scriptable.cpp
index cd7854da..42e2fbda 100644
--- a/src/script/scriptable.cpp
+++ b/src/script/scriptable.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/scriptable.hpp>
 #include <script/context.hpp>
 #include <script/parser.hpp>
diff --git a/src/script/value.cpp b/src/script/value.cpp
index 3b8ae820..91f5a1d8 100644
--- a/src/script/value.cpp
+++ b/src/script/value.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <script/value.hpp>
 #include <script/to_value.hpp>
 #include <util/error.hpp>
diff --git a/src/util/action_stack.cpp b/src/util/action_stack.cpp
index 67c17a11..04b472b1 100644
--- a/src/util/action_stack.cpp
+++ b/src/util/action_stack.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/action_stack.hpp>
 #include <util/for_each.hpp>
 #include <algorithm>
diff --git a/src/util/age.cpp b/src/util/age.cpp
index 70e0b760..c8a1e2d6 100644
--- a/src/util/age.cpp
+++ b/src/util/age.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/age.hpp>
 
 // ----------------------------------------------------------------------------- : Age
diff --git a/src/util/alignment.cpp b/src/util/alignment.cpp
index e2f4ac2f..b2eed5ab 100644
--- a/src/util/alignment.cpp
+++ b/src/util/alignment.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/alignment.hpp>
 #include <util/reflect.hpp>
 
diff --git a/src/util/atomic.hpp b/src/util/atomic.hpp
index 227ec292..9109a072 100644
--- a/src/util/atomic.hpp
+++ b/src/util/atomic.hpp
@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------------------------- : AtomicInt : windows
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
 	
 	#ifdef _MSC_VER
 		extern "C" {
@@ -28,7 +28,7 @@
 		#pragma intrinsic (_InterlockedDecrement)
 		#define InterlockedDecrement _InterlockedDecrement
 	#endif
-		
+	
 	/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
 	typedef LONG AtomicIntEquiv;
 	
@@ -50,7 +50,33 @@
 	  private:
 		AtomicIntEquiv    v;  ///< The value
 	};
-
+	
+	/// We have a fast AtomicInt
+	#define HAVE_FAST_ATOMIC
+	
+// ----------------------------------------------------------------------------- : AtomicInt : GCC
+#elif defined(__GNUC__)
+	
+	/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
+	typedef unsigned int AtomicIntEquiv;
+	
+	/// An integer that can be incremented and decremented atomicly
+	class AtomicIntEquiv {
+	  public:
+		AtomicIntEquiv(AtomicIntEquiv v) : v(v) {}
+		inline operator AtomicIntEquiv() const {
+			return v;
+		}
+		inline AtomicIntEquiv operator ++ () {
+			return __sync_add_and_fetch(&v,1);
+		}
+		inline AtomicIntEquiv operator -- () {
+			return __sync_add_and_fetch(&v,(AtomicIntEquiv)-1);
+		}
+	  private:
+		AtomicIntEquiv v;
+	};
+	
 	/// We have a fast AtomicInt
 	#define HAVE_FAST_ATOMIC
 	
diff --git a/src/util/delayed_index_maps.hpp b/src/util/delayed_index_maps.hpp
index 80e05daa..29ce4cfc 100644
--- a/src/util/delayed_index_maps.hpp
+++ b/src/util/delayed_index_maps.hpp
@@ -58,7 +58,11 @@ void Reader::handle(DelayedIndexMapsData<Key,Value>& d) {
 }
 template <typename Key, typename Value>
 void Writer::handle(const DelayedIndexMapsData<Key,Value>& d) {
-	handle(d.read_data);
+	if (!d.unread_data.empty()) {
+		handle(d.unread_data); // TODO: how to handle filenames
+	} else {
+		handle(d.read_data);
+	}
 }
 template <typename Key, typename Value>
 void GetMember::handle(const DelayedIndexMapsData<Key,Value>& d) {
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 080efe50..3ffb161a 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/error.hpp>
 
 DECLARE_TYPEOF_COLLECTION(ScriptParseError);
diff --git a/src/util/file_utils.cpp b/src/util/file_utils.cpp
new file mode 100644
index 00000000..5cc119cb
--- /dev/null
+++ b/src/util/file_utils.cpp
@@ -0,0 +1,134 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+#include <util/file_utils.hpp>
+#include <wx/filename.h>
+#include <wx/dir.h>
+
+DECLARE_TYPEOF_COLLECTION(String);
+
+// ----------------------------------------------------------------------------- : File names
+
+String normalize_filename(const String& name) {
+	wxFileName fn(name);
+	fn.Normalize();
+	return fn.GetFullPath();
+}
+
+String normalize_internal_filename(const String& name) {
+	String ret;
+	FOR_EACH_CONST(c, name) {
+		if (c==_('\\')) ret += _('/');
+		else            ret += toLower(c);
+	}
+	return ret;
+}
+
+bool ignore_file(const String& name) {
+	// Files that are never part of a package,
+	// i.e. random stuff the OS file manager dumps without being asked
+	return name == _("Thumbs.db"); // winXP explorer thumbnails
+}
+
+// ----------------------------------------------------------------------------- : Directories
+
+bool create_parent_dirs(const String& file) {
+	for (size_t pos = file.find_first_of(_("\\/")) ;
+	     pos != String::npos ;
+	     pos = file.find_first_of(_("\\/"),pos+1)) {
+		String part = file.substr(0,pos);
+		if (!wxDirExists(part)) {
+			if (!wxMkdir(part)) return false;
+		}
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------------- : Removing
+
+class RecursiveDeleter : public wxDirTraverser {
+  public:
+	RecursiveDeleter(const String& start) {
+		to_delete.push_back(start);
+	}
+	~RecursiveDeleter() {
+		FOR_EACH_REVERSE(dir, to_delete) {
+			wxRmdir(dir);
+		}
+	}
+	
+	wxDirTraverseResult OnFile(const String& filename) {
+		if (!wxRemoveFile(filename))
+			handle_error(_("Cannot delete ") + filename + _(". ")
+				_("The remainder of the package has still been removed, if possible.")
+				_("Other packages may have been removed, including packages that this on is dependent on. Please remove manually."));
+		return wxDIR_CONTINUE;
+	}
+	wxDirTraverseResult OnDir(const String& dirname) {
+		to_delete.push_back(dirname);
+		return wxDIR_CONTINUE;
+	}
+  private:
+	vector<String> to_delete;
+};
+
+bool remove_file_or_dir(const String& name) {
+	if (wxFileExists(name)) {
+		return wxRemoveFile(name);
+	} else if (wxDirExists(name)) {
+		wxDir dir(name);
+		RecursiveDeleter rd(name);
+		dir.Traverse(rd);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------------- : Renaming
+
+bool rename_file_or_dir(const String& from, const String& to) {
+	create_parent_dirs(to);
+	return wxRenameFile(from, to);
+}
+
+// ----------------------------------------------------------------------------- : Moving
+
+class IgnoredMover : public wxDirTraverser {
+  public:
+	IgnoredMover(const String& from, const String& to)
+		: from(from), to(to)
+	{}
+	wxDirTraverseResult OnFile(const String& filename) {
+		tryMove(filename);
+		return wxDIR_CONTINUE;
+	}
+	wxDirTraverseResult OnDir(const String& dirname) {
+		return tryMove(dirname) ? wxDIR_IGNORE : wxDIR_CONTINUE;
+	}
+  private:
+	String from, to;
+	bool tryMove(const String& from_path) {
+		if (is_substr(from_path,0,from)) {
+			String to_path = to + from_path.substr(from.size());
+			return rename_file_or_dir(from_path, to_path);
+		} else {
+			// This shouldn't happen
+			return false;
+		}
+	}
+};
+
+void move_ignored_files(const String& from_dir, const String& to_dir) {
+	if (wxDirExists(from_dir) && wxDirExists(to_dir)) {
+		wxDir dir(from_dir);
+		IgnoredMover im(from_dir, to_dir);
+		dir.Traverse(im);
+	}
+}
diff --git a/src/util/file_utils.hpp b/src/util/file_utils.hpp
new file mode 100644
index 00000000..e5a3b83e
--- /dev/null
+++ b/src/util/file_utils.hpp
@@ -0,0 +1,44 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_UTIL_FILE_UTILS
+#define HEADER_UTIL_FILE_UTILS
+
+// ----------------------------------------------------------------------------- : Includes
+
+#include <util/prec.hpp>
+
+// ----------------------------------------------------------------------------- : File names
+
+/// Normalize a filename as much as possible, for real files
+String normalize_filename(const String& filename);
+
+/// Normalize a filename as much as possible, for files in packages
+String normalize_internal_filename(const String& filename);
+
+/// Should a file with the given name be ignored?
+bool ignore_file(const String& name);
+
+// ----------------------------------------------------------------------------- : Removing and renaming
+
+/// Ensure that the parent directories of the given filename exist
+bool create_parent_dirs(const String& file);
+
+/// Remove the given file or directory
+/** It is not an error if the file doesn't exist.
+ *  Removes all files in a directory.
+ *  Returns true if something was removed
+ */
+bool remove_file_or_dir(const String& file);
+
+/// Rename a file or directory
+bool rename_file_or_dir(const String& old_name, const String& new_name);
+
+/// Move files/dirs that are ignored by packages to another directory
+void move_ignored_files(const String& from_dir, const String& to_dir);
+
+// ----------------------------------------------------------------------------- : EOF
+#endif
diff --git a/src/util/io/get_member.cpp b/src/util/io/get_member.cpp
index 912511ac..1ecfc9d7 100644
--- a/src/util/io/get_member.cpp
+++ b/src/util/io/get_member.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/io/get_member.hpp>
 #include <util/vector2d.hpp>
 #include <script/script.hpp>
diff --git a/src/util/io/get_member.hpp b/src/util/io/get_member.hpp
index f916bbc2..47322c1b 100644
--- a/src/util/io/get_member.hpp
+++ b/src/util/io/get_member.hpp
@@ -29,6 +29,7 @@ class GetDefaultMember {
 	inline bool scripting() const { return true; }
 	inline bool isComplex() const { return false; }
 	inline void addAlias(int, const Char*, const Char*) {}
+	inline void handleIgnore(int, const Char*) {}
 	inline void handleAppVersion() {} // no effect
 	
 	/// The result, or script_nil if the member was not found
@@ -76,6 +77,7 @@ class GetMember : private GetDefaultMember {
 	inline bool scripting() const { return true; }
 	inline bool isComplex() const { return false; }
 	inline void addAlias(int, const Char*, const Char*) {}
+	inline void handleIgnore(int, const Char*) {}
 	inline void handleAppVersion() {} // no effect
 	
 	/// The result, or script_nil if the member was not found
diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp
index a5d5d56a..d4f589b0 100644
--- a/src/util/io/package.cpp
+++ b/src/util/io/package.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/io/package.hpp>
 #include <util/io/package_manager.hpp>
 #include <util/error.hpp>
@@ -180,7 +181,7 @@ InputStreamP Package::openIn(const String& file) {
 		Packaged* p = dynamic_cast<Packaged*>(this);
 		return packages.openFileFromPackage(p, file);
 	}
-	FileInfos::iterator it = files.find(toStandardName(file));
+	FileInfos::iterator it = files.find(normalize_internal_filename(file));
 	if (it == files.end()) {
 		// does it look like a relative filename?
 		if (filename.find(_(".mse-")) != String::npos) {
@@ -262,7 +263,7 @@ void Package::referenceFile(const String& file) {
 
 String Package::absoluteName(const String& file) {
 	assert(wxThread::IsMain());
-	FileInfos::iterator it = files.find(toStandardName(file));
+	FileInfos::iterator it = files.find(normalize_internal_filename(file));
 	if (it == files.end()) {
 		throw FileNotFoundError(file, filename);
 	}
@@ -307,7 +308,7 @@ void Package::loadZipStream() {
 	while (true) {
 		wxZipEntry* entry = zipStream->GetNextEntry();
 		if (!entry) break;
-		String name = toStandardName(entry->GetName());
+		String name = normalize_internal_filename(entry->GetName());
 		files[name].zipEntry = entry;
 	}
 	zipStream->CloseEntry();
@@ -323,6 +324,7 @@ void Package::openSubdir(const String& name) {
 	// find files
 	String f; // filename
 	for(bool ok = d.GetFirst(&f, wxEmptyString, wxDIR_FILES | wxDIR_HIDDEN) ; ok ; ok = d.GetNext(&f)) {
+		if (ignore_file(f)) continue;
 		// add file
 		addFile(name + f);
 		// get modified time
@@ -422,18 +424,22 @@ void Package::saveToZipfile(const String& saveAs, bool remove_unused) {
 
 
 Package::FileInfos::iterator Package::addFile(const String& name) {
-	return files.insert(make_pair(toStandardName(name), FileInfo())).first;
+	return files.insert(make_pair(normalize_internal_filename(name), FileInfo())).first;
 }
 
-String Package::toStandardName(const String& name) {
-	String ret;
-	FOR_EACH_CONST(c, name) {
-		if (c==_('\\')) ret += _('/');
-		else            ret += toLower(c);
+DateTime Package::modificationTime(const pair<String, FileInfo>& fi) const {
+	if (fi.second.wasWritten()) {
+		return wxFileName(fi.first).GetModificationTime();
+	} else if (fi.second.zipEntry) {
+		return fi.second.zipEntry->GetDateTime();
+	} else if (wxFileExists(filename+_("/")+fi.first)) {
+		return wxFileName(filename+_("/")+fi.first).GetModificationTime();
+	} else {
+		return DateTime();
 	}
-	return ret;
 }
 
+
 // ----------------------------------------------------------------------------- : Packaged
 
 template <> void Reader::handle(PackageDependency& dep) {
@@ -463,6 +469,7 @@ IMPLEMENT_REFLECTION(Packaged) {
 	REFLECT(full_name);
 	REFLECT_N("icon", icon_filename);
 	REFLECT_NO_SCRIPT(position_hint);
+	REFLECT(installer_group);
 	REFLECT(version);
 	REFLECT(compatible_version);
 	REFLECT_NO_SCRIPT_N("depends ons", dependencies); // hack for singular_form
diff --git a/src/util/io/package.hpp b/src/util/io/package.hpp
index c37ae079..90da5ba3 100644
--- a/src/util/io/package.hpp
+++ b/src/util/io/package.hpp
@@ -12,6 +12,7 @@
 #include <util/reflect.hpp>
 #include <util/dynamic_arg.hpp>
 #include <util/error.hpp>
+#include <util/file_utils.hpp>
 
 class Package;
 class wxFileInputStream;
@@ -147,8 +148,8 @@ class Package : public IntrusivePtrVirtualBase {
 		bool keep;               ///< Should this file be kept in the package? (as opposed to deleting it)
 		String tempName;         ///< Name of the temporary file where new contents of this file are placed
 		wxZipEntry* zipEntry;    ///< Entry in the zip file for this file
-		inline bool wasWritten() ///< Is this file changed, and therefore written to a temporary file?
-		 { return !tempName.empty(); }
+		/// Is this file changed, and therefore written to a temporary file?
+		inline bool wasWritten() const { return !tempName.empty(); }
 	};
 		
 	/// Filename of the package
@@ -160,6 +161,8 @@ class Package : public IntrusivePtrVirtualBase {
 	/** Note: must be public for DECLARE_TYPEOF to work */
 	typedef map<String, FileInfo> FileInfos;
 	inline const FileInfos& getFileInfos() const { return files; }
+	/// When was a file last modified?
+	DateTime modificationTime(const pair<String, FileInfo>& fi) const;
   private:
 	/// All files in the package
 	FileInfos files;
@@ -175,7 +178,6 @@ class Package : public IntrusivePtrVirtualBase {
 	void saveToZipfile(const String&, bool);
 	void saveToDirectory(const String&, bool);
 	FileInfos::iterator addFile(const String& file);
-	static String toStandardName(const String& file);
 };
 
 // ----------------------------------------------------------------------------- : Packaged
@@ -199,6 +201,7 @@ class Packaged : public Package {
 	
 	Version version;			///< Version number of this package
 	Version compatible_version;	///< Earliest version number this package is compatible with
+	String installer_group;		///< Group to place this package in in the installer
 	String short_name;			///< Short name of this package
 	String full_name;			///< Name of this package, for menus etc.
 	String icon_filename;		///< Filename of icon to use in package lists
diff --git a/src/util/io/package_manager.cpp b/src/util/io/package_manager.cpp
index e7a503e4..f1b0e272 100644
--- a/src/util/io/package_manager.cpp
+++ b/src/util/io/package_manager.cpp
@@ -6,66 +6,58 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/io/package_manager.hpp>
 #include <util/error.hpp>
+#include <util/file_utils.hpp>
 #include <data/game.hpp>
 #include <data/stylesheet.hpp>
 #include <data/symbol_font.hpp>
 #include <data/locale.hpp>
 #include <data/export_template.hpp>
+#include <data/installer.hpp>
 #include <wx/stdpaths.h>
+#include <wx/wfstream.h>
 
-// ----------------------------------------------------------------------------- : PackageManager
+DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
+DECLARE_TYPEOF_COLLECTION(PackageVersion::FileInfo);
+
+// ----------------------------------------------------------------------------- : PackageManager : in memory
 
 PackageManager packages;
 
 
 void PackageManager::init() {
-	// determine data directory
-	global_data_directory = wxStandardPaths::Get().GetDataDir();
-	// check if this is the actual data directory, especially during debugging,
-	// the data may be higher up:
-	//  exe path  = mse/build/debug/mse.exe
-	//  data path = mse/data
-	while (!wxDirExists(global_data_directory + _("/data"))) {
-		String d = global_data_directory;
-		global_data_directory = wxPathOnly(global_data_directory);
-		if (d == global_data_directory) {
-			// we are at the root -> 'data' not found anywhere in the path -> fatal error
-			throw Error(_("The global MSE data files can not be found, there should be a directory called 'data' with these files. The expected directory to find it in was ") + wxStandardPaths::Get().GetDataDir());
-		}
-	}
-	global_data_directory += _("/data");
-	// It's not an error for the local directory not to exist.
-	local_data_directory = wxStandardPaths::Get().GetUserDataDir();
-	local_data_directory += _("/data");
+	local.init(true);
+	global.init(false);
+}
+void PackageManager::destroy() {
+	loaded_packages.clear();
+}
+void PackageManager::reset() {
+	loaded_packages.clear();
 }
 
-PackagedP PackageManager::openAny(const String& name, bool just_header) {
+PackagedP PackageManager::openAny(const String& name_, bool just_header) {
+	String name = trim(name_);
 	// Attempt to load local data first.
 	String filename;
-	wxFileName fn;
 	if (wxFileName(name).IsRelative()) {
 		// local data dir?
-		fn.Assign(local_data_directory + _("/") + name);
-		fn.Normalize();
-		filename = fn.GetFullPath();
+		filename = normalize_filename(local.name(name));
 		if (!wxFileExists(filename) && !wxDirExists(filename)) {
 			// global data dir
-			fn.Assign(global_data_directory + _("/") + name);
-			fn.Normalize();
-			filename = fn.GetFullPath();
+			filename = normalize_filename(global.name(name));
 		}
 	} else { // Absolute filename
-		fn.Assign(name);
-		fn.Normalize();
-		filename = fn.GetFullPath();
+		filename = normalize_filename(name);
 	}
 
 	// Is this package already loaded?
 	PackagedP& p = loaded_packages[filename];
 	if (!p) {
 		// load with the right type, based on extension
+		wxFileName fn(filename);
 		if      (fn.GetExt() == _("mse-game"))            p = new_intrusive<Game>();
 		else if (fn.GetExt() == _("mse-style"))           p = new_intrusive<StyleSheet>();
 		else if (fn.GetExt() == _("mse-locale"))          p = new_intrusive<Locale>();
@@ -76,22 +68,21 @@ PackagedP PackageManager::openAny(const String& name, bool just_header) {
 			throw PackageError(_("Unrecognized package type: '") + fn.GetExt() + _("'\nwhile trying to open: ") + name);
 		}
 		p->open(filename, just_header);
+	} else if (!just_header) {
+		p->loadFully();
 	}
 	return p;
 }
 
 void PackageManager::findMatching(const String& pattern, vector<PackagedP>& out) {
-	String file;
 	// first find local packages
-	if (wxDirExists(local_data_directory)) {
-		String file = wxFindFirstFile(local_data_directory + _("/") + pattern, 0);
-		while (!file.empty()) {
-			out.push_back(openAny(file, true));
-			file = wxFindNextFile();
-		}
+	String file = local.findFirstMatching(pattern);
+	while (!file.empty()) {
+		out.push_back(openAny(file, true));
+		file = wxFindNextFile();
 	}
 	// then global packages not already in the list
-	file = wxFindFirstFile(global_data_directory + _("/") + pattern, 0);
+	file = global.findFirstMatching(pattern);
 	while (!file.empty()) {
 		PackagedP p = openAny(file, true);
 		if (find(out.begin(), out.end(), p) == out.end()) {
@@ -121,17 +112,21 @@ InputStreamP PackageManager::openFileFromPackage(Packaged*& package, const Strin
 	throw FileNotFoundError(name, _("No package name specified, use '/package/filename'"));
 }
 
+// ----------------------------------------------------------------------------- : PackageManager : on disk
+
 bool PackageManager::checkDependency(const PackageDependency& dep, bool report_errors) {
-	// try local package
-	String name = local_data_directory + _("/") + dep.package;
-	if (!wxFileExists(name) && !wxDirExists(name)) {
-		// try global package
-		name = global_data_directory + _("/") + dep.package;
-		if (!wxFileExists(name) && !wxDirExists(name)) {
-			if (report_errors)
-				handle_warning(_ERROR_1_("package not found", dep.package),false);
-			return false;
+	// mse package?
+	if (dep.package == mse_package) {
+		if (app_version < dep.version) {
+			handle_warning(_ERROR_3_("package out of date", _("Magic Set Editor"), app_version.toString(), dep.version.toString()),false);
 		}
+		return true;
+	}
+	// does the package exist?
+	if (!local.exists(dep.package) && !global.exists(dep.package)) {
+		if (report_errors)
+			handle_warning(_ERROR_1_("package not found", dep.package),false);
+		return false;
 	}
 	PackagedP package = openAny(dep.package, true);
 	if (package->version < dep.version) {
@@ -141,7 +136,290 @@ bool PackageManager::checkDependency(const PackageDependency& dep, bool report_e
 	}
 	return true;
 }
-
-void PackageManager::destroy() {
-	loaded_packages.clear();
+bool PackageManager::installedVersion(const String& package_name, Version& version_out) {
+	if (package_name == mse_package) {
+		version_out = app_version;
+		return true;
+	} else {
+		if (!local.exists(package_name) && !global.exists(package_name)) return false;
+		PackagedP package = openAny(package_name, true);
+		version_out = package->version;
+		return true;
+	}
+}
+
+void PackageManager::installedPackages(vector<InstallablePackageP>& packages) {
+	// from directories
+	vector<InstallablePackageP> more_packages;
+	global.installedPackages(packages);
+	local.installedPackages(more_packages);
+	merge(packages, more_packages);
+	// the magic appliation package
+	packages.push_back(mse_installable_package());
+}
+
+void PackageManager::install(const InstallablePackage& package) {
+	bool install_local = package.action & PACKAGE_LOCAL;
+	(install_local ? local : global).install(package);
+}
+
+// ----------------------------------------------------------------------------- : PackageDirectory
+
+void PackageDirectory::init(bool local) {
+	is_local = local;
+	if (local) {
+		init(wxStandardPaths::Get().GetUserDataDir() + _("/data"));
+	} else {
+		// determine data directory
+		String dir = wxStandardPaths::Get().GetDataDir();
+		// check if this is the actual data directory, especially during debugging,
+		// the data may be higher up:
+		//  exe path  = mse/build/debug/mse.exe
+		//  data path = mse/data
+		while (!wxDirExists(dir + _("/data"))) {
+			String d = dir;
+			dir = wxPathOnly(dir);
+			if (d == dir) {
+				// we are at the root -> 'data' not found anywhere in the path -> fatal error
+				throw Error(_("The global MSE data files can not be found, there should be a directory called 'data' with these files. The expected place to find it in was ") + wxStandardPaths::Get().GetDataDir());
+			}
+		}
+		init(dir + _("/data"));
+	}
+}
+void PackageDirectory::init(const String& dir) {
+	directory = dir;
+}
+
+String PackageDirectory::name(const String& name) const {
+	return directory + _("/") + name;
+}
+bool PackageDirectory::exists(const String& filename) const {
+	String fn = name(filename);
+	return wxFileExists(fn) || wxDirExists(fn);
+}
+
+String PackageDirectory::findFirstMatching(const String& pattern) const {
+	if (!wxDirExists(directory)) return String();
+	return wxFindFirstFile(directory + _("/") + pattern, 0);
+}
+
+bool compare_name(const PackageVersionP& a, const PackageVersionP& b) {
+	return a->name < b->name;
+}
+
+void PackageDirectory::installedPackages(vector<InstallablePackageP>& packages_out) {
+	loadDatabase();
+	// find all package files
+	vector<String> in_dir;
+	for (String s = findFirstMatching(_("*.mse-*")) ; !s.empty() ; s = wxFindNextFile()) {
+		size_t pos = s.find_last_of(_("/\\"));
+		if (pos != String::npos) s = s.substr(pos+1);
+		// TODO : check for valid package names
+		in_dir.push_back(s);
+	}
+	sort(in_dir.begin(), in_dir.end());
+	// merge with package database
+	bool db_changed = false;
+	vector<PackageVersionP>::const_iterator it1 = packages.begin();
+	vector<String>::const_iterator          it2 = in_dir.begin();
+	while (it2 != in_dir.end()) {
+		if (it1 == packages.end() || (*it1)->name > *it2) {
+			// add new package to db
+			try {
+				PackagedP pack = ::packages.openAny(*it2, true);
+				db_changed = true;
+				PackageVersionP ver(new PackageVersion(
+					is_local ? PackageVersion::STATUS_LOCAL : PackageVersion::STATUS_GLOBAL));
+				ver->check_status(*pack);
+				packages_out.push_back(new_intrusive2<InstallablePackage>(ver, new_intrusive1<PackageDescription>(*pack)));
+			} catch (const Error&) {}
+			++it2;
+		} else if ((*it1)->name < *it2) {
+			// delete package from db
+			db_changed = true;
+			++it1;
+		} else {
+			// ok, a package already in the db
+			try {
+				PackagedP pack = ::packages.openAny(*it2, true);
+				(*it1)->check_status(*pack);
+				packages_out.push_back(new_intrusive2<InstallablePackage>(*it1, new_intrusive1<PackageDescription>(*pack)));
+			} catch (const Error&) { db_changed = true; }
+			++it1, ++it2;
+		}
+	}
+	if (it1 != packages.end()) db_changed = true;
+	// has the database of installed packages changed?
+	if (db_changed) {
+		packages.clear();
+		FOR_EACH(p, packages_out) {
+			if (p->installed) packages.push_back(p->installed);
+		}
+		saveDatabase();
+	}
+}
+
+IMPLEMENT_REFLECTION(PackageDirectory) {
+	REFLECT(packages);
+}
+
+void PackageDirectory::loadDatabase() {
+	if (!packages.empty()) return;
+	String filename = databaseFile();
+	if (wxFileExists(filename)) {
+		// packages file not existing is not an error
+		shared_ptr<wxFileInputStream> file = new_shared1<wxFileInputStream>(filename);
+		if (!file->Ok()) return; // failure is not an error
+		Reader reader(file, nullptr, filename);
+		reader.handle_greedy(*this);
+		sort(packages.begin(), packages.end(), compare_name);
+	}
+}
+
+void PackageDirectory::saveDatabase() {
+	Writer writer(new_shared1<wxFileOutputStream>(databaseFile()));
+	writer.handle(*this);
+}
+String PackageDirectory::databaseFile() {
+	return name(_("packages"));
+}
+
+// ----------------------------------------------------------------------------- : PackageDirectory : installing
+
+bool PackageDirectory::install(const InstallablePackage& package) {
+	String n = name(package.description->name);
+	if (package.action & PACKAGE_REMOVE) {
+		remove_file_or_dir(n);
+	} else if ((package.action & PACKAGE_UPGRADE) || (package.action & PACKAGE_INSTALL)) {
+		remove_file_or_dir(n + _(".new"));
+		bool ok = actual_install(package, n + _(".new"));
+		if (!ok) return false;
+		move_ignored_files(n, n + _(".new"));
+		remove_file_or_dir(n);
+		rename_file_or_dir(n + _(".new"), n);
+	}
+	return true;
+}
+
+bool PackageDirectory::actual_install(const InstallablePackage& package, const String& install_dir) {
+	String name = package.description->name;
+	if (!package.installer->installer) {
+		handle_warning(_("Installer not found for package: ") + name);
+		return false;
+	}
+	Installer& installer = *package.installer->installer;
+	// install files
+	const Packaged::FileInfos& file_infos = installer.getFileInfos();
+	for (Packaged::FileInfos::const_iterator it = file_infos.begin() ; it != file_infos.end() ; ++it) {
+		String file = it->first;
+		if (!is_substr(file,0,name)) continue; // not the right package
+		// correct filename
+		file = install_dir + file.substr(name.length());
+		create_parent_dirs(file);
+		// copy file
+		InputStreamP is = installer.openIn(file);
+		wxFileOutputStream os (install_dir + _("/") + file);
+		if (!os.IsOk()) {
+			int act = wxMessageBox(_ERROR_1_("cannot create file", file), _TITLE_("cannot create file"), wxICON_ERROR | wxYES_NO);
+			if (act == wxNO) return false;
+		}
+		os.Write(*is);
+	}
+	// update package database
+	return true;
+}
+
+// ----------------------------------------------------------------------------- : PackageVersion
+
+template <> void Writer::handle(const PackageVersion::FileInfo& f) {
+	if (f.status == PackageVersion::FILE_DELETED) {
+		handle(_("D ") + f.file);
+	} else {
+		handle(format_string(_("%s%s %s"),
+			  f.status == PackageVersion::FILE_ADDED    ? _("A")
+			: f.status == PackageVersion::FILE_MODIFIED ? _("M") : _(""),
+			f.time.Format(_("%Y%m%dT%H%M%S")),
+			f.file));
+	}
+}
+template <> void Reader::handle(PackageVersion::FileInfo& f) {
+	String s; handle(s);
+	// read status
+	if (s.size() < 2) {f.status = PackageVersion::FILE_ADDED; return; }
+	f.status = s.GetChar(0) == _('M') ? PackageVersion::FILE_MODIFIED
+	         : s.GetChar(0) == _('A') ? PackageVersion::FILE_ADDED
+	         : s.GetChar(0) == _('D') ? PackageVersion::FILE_DELETED
+	         :                          PackageVersion::FILE_UNCHANGED;
+	if (f.status == PackageVersion::FILE_DELETED) {
+		if (s.GetChar(1) != _(' ')) {f.status = PackageVersion::FILE_ADDED; return; }
+		f.file = s.substr(2);
+		return;
+	} else if (f.status != PackageVersion::FILE_UNCHANGED) {
+		s = s.substr(1);
+	}
+	if (s.size() < 8+1+6+1)         {f.status = PackageVersion::FILE_ADDED; return; }
+	if (s.GetChar(8+1+6) != _(' ')) {f.status = PackageVersion::FILE_ADDED; return; } // invalid format
+	// read time, filename
+	f.time.ParseFormat(s, _("%Y%m%dT%H%M%S"));
+	f.file = s.substr(8+1+6+1);
+}
+IMPLEMENT_REFLECTION_NO_SCRIPT(PackageVersion) {
+	REFLECT_NO_SCRIPT(name);
+	REFLECT_NO_SCRIPT(version);
+	REFLECT_NO_SCRIPT(status);
+	REFLECT_NO_SCRIPT(files);
+}
+
+void PackageVersion::check_status(Packaged& package) {
+	status &= ~STATUS_MODIFIED;
+	if (!(status & STATUS_BLESSED)) status |= STATUS_MODIFIED;
+	name    = package.relativeFilename();
+	version = package.version;
+	// Merge our files list with the list from the package
+	vector<FileInfo> new_files;
+	Package::FileInfos fis = package.getFileInfos();
+	Package::FileInfos::const_iterator it1 = fis.begin();
+	vector<FileInfo>::iterator it2 = files.begin();
+//%	size_t it2 = 0, size = files.size();
+//%	bool need_sort = false;
+	while(it1 != fis.end() || it2 != files.end()) {
+		if (it1 != fis.end() && it2 != files.end() && it1->first == it2->file) {
+			DateTime mtime = package.modificationTime(*it1);
+			if (mtime != it2->time) {
+				it2->time   = mtime;
+				it2->status = FILE_MODIFIED;
+				new_files.push_back(*it2);
+				status |= STATUS_MODIFIED;
+			}
+			++it1; ++it2;
+		} else if (it1 != fis.end() && (it2 == files.end() || it1->first < it2->file)) {
+			// this is a new file
+			DateTime mtime = package.modificationTime(*it1);
+			new_files.push_back(FileInfo(it1->first, mtime, FILE_ADDED));
+			status |= STATUS_MODIFIED;
+			++it1;
+		} else {
+			// this file is no longer in the package, it was deleted
+			if (it2->status != FILE_ADDED) {
+				it2->status = FILE_DELETED;
+				new_files.push_back(*it2);
+				status |= STATUS_MODIFIED;
+			}
+			++it2;
+		}
+	}
+	swap(files,new_files);
+}
+
+inline bool is_deleted(PackageVersion::FileInfo f) {
+	return f.status == PackageVersion::FILE_DELETED;
+}
+void PackageVersion::bless() {
+	files.erase(remove_if(files.begin(),files.end(),is_deleted),files.end());
+	FOR_EACH(f,files) {
+		f.status = FILE_UNCHANGED;
+	}
+	status &= ~STATUS_MODIFIED;
+	status |= STATUS_BLESSED;
 }
diff --git a/src/util/io/package_manager.hpp b/src/util/io/package_manager.hpp
index fc2616cf..c92ddc3a 100644
--- a/src/util/io/package_manager.hpp
+++ b/src/util/io/package_manager.hpp
@@ -14,11 +14,86 @@
 #include <wx/filename.h>
 
 DECLARE_POINTER_TYPE(Packaged);
+DECLARE_POINTER_TYPE(PackageVersion);
+DECLARE_POINTER_TYPE(InstallablePackage);
 class PackageDependency;
 
+// ----------------------------------------------------------------------------- : PackageVersion
+
+/*
+
+/// Information on a package in a repository
+class PackageVersionData : public IntrusivePtrVirtualBase {
+  public:
+	PackageVersionData() {}
+	
+	String  name;						///< Name of the package
+	String  short_name;					///< Name to show on package list.
+	String  description;				///< html description
+	bool    hidden;						///< Not shown in the package list (installed automatically as a dependency)
+	
+	PackageVersionP base_version;		///< The locally installed version (if installed)
+	PackageVersionP local_version;		///< Modifications made to the locally installed version?
+	PackageVersionP remote_version;		///< The version available from the server (if available)
+	bool global;						///< The installed package is in the global location, not the user-local one
+	bool new_global;					///< 
+	
+	bool source_local;					///< Is the source
+	String source;						///< Where can the package be downloaded/found?
+	
+	DECLARE_REFLECTION();
+};
+
+class UpdateData {
+	vector<PackageDependencyP> packages;         ///< package/latest-version-number pairs
+	String                     new_updates_url;  ///< updates url has changed? 
+};
+
+IMPLEMENT_REFLECTION_NO_SCRIPT(UpdateData) {
+	REFLECT_NO_SCRIPT(packages);
+	REFLECT_NO_SCRIPT(new_updates_url);
+}
+*/
+
+// ----------------------------------------------------------------------------- : PackageDirectory
+
+/// A directory for packages
+class PackageDirectory {
+  public:
+	void init(bool local);
+	void init(const String& dir);
+	
+	/// Name of a package in this directory
+	String name(const String& name) const;
+	/// Does a package with the given name exist?
+	bool exists(const String& name) const;
+	
+	/// Find all packages that match a filename pattern (using wxFindFirst)
+	String findFirstMatching(const String& pattern) const;
+	
+	/// Get all installed packages
+	void installedPackages(vector<InstallablePackageP>& packages);
+	
+	/// Install/uninstall a package
+	bool install(const InstallablePackage& package);
+	
+	void loadDatabase();
+	void saveDatabase();
+  private:
+	bool   is_local;
+	String directory;
+	vector<PackageVersionP> packages; // sorted by name
+	
+	String databaseFile();
+	// Do the actual installation of a package
+	bool actual_install(const InstallablePackage& package, const String& install_dir);
+	
+	DECLARE_REFLECTION();
+};
+
 // ----------------------------------------------------------------------------- : PackageManager
 
-/// Package manager, loads data files from the default data directory
+/// Package manager, loads data files from the default data directory.
 /** The PackageManager ensures that each package is only loaded once.
  *  There is a single global instance of the PackageManager, called packages
  */
@@ -30,30 +105,20 @@ class PackageManager {
 	/** This function MUST be called before the program terminates, otherwise
 	 *  we could get into fights with pool allocators used by ScriptValues */
 	void destroy();
+	/// Empty the list of packages, they will all be reloaded
+	void reset();
+	
+	// --------------------------------------------------- : Packages in memory
 	
 	/// Open a package with the specified name (including extension)
 	template <typename T>
 	intrusive_ptr<T> open(const String& name) {
-		wxFileName loc(local_data_directory + _("/") + name);
-		loc.Normalize();
-		String filename = loc.GetFullPath();
-		if (!wxFileExists(filename) && !wxDirExists(filename)) {
-			wxFileName glob(global_data_directory + _("/") + name);
-			glob.Normalize();
-			filename = glob.GetFullPath();
-		}
-		// Is this package already loaded?
-		PackagedP& p = loaded_packages[filename];
+		PackagedP p = openAny(name);
 		intrusive_ptr<T> typedP = dynamic_pointer_cast<T>(p);
 		if (typedP) {
-			typedP->loadFully();
 			return typedP;
 		} else {
-			// not loaded, or loaded with wrong type (i.e. with just_header)
-			typedP = new_intrusive<T>();
-			typedP->open(filename);
-			p = typedP;
-			return typedP;
+			throw InternalError(format_string(_("Package %s loaded as wrong type"),name));
 		}
 	}
 	
@@ -75,25 +140,77 @@ class PackageManager {
 	 */
 	InputStreamP openFileFromPackage(Packaged*& package, const String& name);
 	
+	// --------------------------------------------------- : Packages on disk
+	
 	/// Check if the given dependency is currently installed
 	bool checkDependency(const PackageDependency& dep, bool report_errors = true);
+	/// Determine the latest version of the given package
+	/** If it is not installed, returns false */
+	bool installedVersion(const String& pkg, Version& version_out);
 	
-	/// Clear that cache of opened packages
-	/** Used by the update manager
-	 */
-	inline void clearPackageCache() { loaded_packages.clear(); }
+	/// Get all installed packages
+	void installedPackages(vector<InstallablePackageP>& packages);
 	
-	inline String getGlobalDataDir() const { return global_data_directory; }
-	inline String getLocalDataDir() const { return local_data_directory; }
+	/// Install/uninstall a package
+	void install(const InstallablePackage& package);
+	
+	// --------------------------------------------------- : Packages on a server
 	
   private:
 	map<String, PackagedP> loaded_packages;
-	String global_data_directory;
-	String local_data_directory;
+	PackageDirectory local, global;
 };
 
 /// The global PackageManager instance
 extern PackageManager packages;
 
+// ----------------------------------------------------------------------------- : PackageVersion
+
+/// Version information for an installed package
+class PackageVersion : public IntrusivePtrBase<PackageVersion> {
+  public:
+	PackageVersion() : status(0) {}
+	PackageVersion(int status) : status(status) {}
+	
+	String  name;
+	Version version;
+	enum Status
+	{	STATUS_LOCAL    = 0x01 ///< Package is installed in the local package dir
+	,	STATUS_GLOBAL   = 0x02 ///< Package is installed in the global package dir
+	,	STATUS_BLESSED  = 0x10 ///< Package is an official version, installed with the installer
+	,	STATUS_MODIFIED = 0x20 ///< Package has been modified after installing
+	,	STATUS_FIXED    = 0x40 ///< The package can not be uninstalled
+	};
+	int status;
+	
+	/// Check the status of the files in this package
+	void check_status(Packaged& package);
+	/// Set blessed status to true
+	void bless();
+	
+  public:
+	/// Status of a single file
+	enum FileStatus
+	{	FILE_UNCHANGED
+	,	FILE_MODIFIED
+	,	FILE_ADDED
+	,	FILE_DELETED
+	};
+	/// Information on files in this package
+	struct FileInfo {
+		inline FileInfo() {}
+		inline FileInfo(const String& file, const DateTime& time, FileStatus status)
+			: file(file), time(time), status(status)
+		{}
+		String     file;
+		DateTime   time;
+		FileStatus status;
+		inline bool operator < (const FileInfo& f) const { return file < f.file; }
+	};
+  private:
+	vector<FileInfo> files; // sorted by filename
+	DECLARE_REFLECTION();
+};
+
 // ----------------------------------------------------------------------------- : EOF
 #endif
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index d9291508..037a3c72 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include "reader.hpp"
 #include <util/vector2d.hpp>
 #include <util/error.hpp>
@@ -40,6 +41,12 @@ void Reader::addAlias(Version end_version, const Char* a, const Char* b) {
 	alias.end_version = end_version;
 }
 
+void Reader::handleIgnore(int end_version, const Char* a) {
+	if (file_app_version < end_version) {
+		if (enterBlock(a)) exitBlock();
+	}
+}
+
 void Reader::handleAppVersion() {
 	if (enterBlock(_("mse_version"))) {
 		handle(file_app_version);
diff --git a/src/util/io/reader.hpp b/src/util/io/reader.hpp
index afb9ab09..8f9d0ccb 100644
--- a/src/util/io/reader.hpp
+++ b/src/util/io/reader.hpp
@@ -54,6 +54,8 @@ class Reader {
 	inline bool isComplex() const { return value.empty(); }
 	/// Add a as an alias for b, all keys a will be replaced with b, only if file_app_version < end_version
 	void addAlias(Version end_version, const Char* a, const Char* b);
+	/// Ignore old keys
+	void handleIgnore(int, const Char*);
 	
 	/// Read and check the application version
 	void handleAppVersion();
diff --git a/src/util/io/writer.cpp b/src/util/io/writer.cpp
index b1ad9b84..48a73ae1 100644
--- a/src/util/io/writer.cpp
+++ b/src/util/io/writer.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include "writer.hpp"
 #include <util/vector2d.hpp>
 #include <util/error.hpp>
diff --git a/src/util/io/writer.hpp b/src/util/io/writer.hpp
index f2a7081e..892b9af8 100644
--- a/src/util/io/writer.hpp
+++ b/src/util/io/writer.hpp
@@ -33,6 +33,7 @@ class Writer {
 	inline bool scripting() const { return false; }
 	inline bool isComplex() const { return false; }
 	inline void addAlias(int, const Char*, const Char*) {}
+	inline void handleIgnore(int, const Char*) {}
 	
 	/// Write the application version
 	void handleAppVersion();
diff --git a/src/util/prec.hpp b/src/util/prec.hpp
index 1b3c45bd..e1693111 100644
--- a/src/util/prec.hpp
+++ b/src/util/prec.hpp
@@ -35,13 +35,6 @@
 #include <set>
 using namespace std;
 
-// MSE utility headers (ones unlikely to change and used everywhere)
-#include "for_each.hpp"
-#include "string.hpp"
-#include "smart_ptr.hpp"
-#include "index_map.hpp"
-#include "locale.hpp"
-
 // ----------------------------------------------------------------------------- : Wx Aliasses
 
 // Remove some of the wxUglyness
@@ -68,11 +61,22 @@ typedef unsigned int  UInt;
 #define nullptr 0
 
 /// A string standing for a filename, has different behaviour when reading/writing
-class FileName : public String {
+class FileName : public wxString {
   public:
-	FileName()                            {}
-	FileName(const String& s) : String(s) {}
+	FileName()                                {}
+	FileName(const wxString& s) : wxString(s) {}
 };
 
+// ----------------------------------------------------------------------------- : MSE Headers
+
+// MSE utility headers (ones unlikely to change and used everywhere)
+#include "for_each.hpp"
+#include "string.hpp"
+#include "smart_ptr.hpp"
+#include "index_map.hpp"
+#include "locale.hpp"
+#include "error.hpp"
+#include "reflect.hpp"
+
 // ----------------------------------------------------------------------------- : EOF
 #endif
diff --git a/src/util/reflect.hpp b/src/util/reflect.hpp
index b4e2db23..41adb186 100644
--- a/src/util/reflect.hpp
+++ b/src/util/reflect.hpp
@@ -141,6 +141,9 @@
  */
 #define REFLECT_ALIAS(version, old, new) tag.addAlias(version, _(old), _(new))
 
+/// Ignore things for backwards compatability for versions < 'version'
+#define REFLECT_IGNORE(version, old) tag.handleIgnore(version, _(old))
+
 /// Reflect a variable, ignores the variable for scripting
 #define REFLECT_NO_SCRIPT(var)          tag.handleNoScript(_(#var), var)
 /// Reflect a variable under the given name
diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp
index 87fc252b..16b212fa 100644
--- a/src/util/rotation.cpp
+++ b/src/util/rotation.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/rotation.hpp>
 #include <gfx/gfx.hpp>
 #include <data/font.hpp>
diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp
index cd418731..4b623dae 100644
--- a/src/util/smart_ptr.hpp
+++ b/src/util/smart_ptr.hpp
@@ -240,5 +240,8 @@ inline shared_ptr<T> new_shared9(const A0& a0, const A1& a1, const A2& a2, const
 	
 #endif
 
+/// Pointer to 'anything'
+typedef intrusive_ptr<IntrusivePtrVirtualBase> VoidP;
+
 // ----------------------------------------------------------------------------- : EOF
 #endif
diff --git a/src/util/spec_sort.cpp b/src/util/spec_sort.cpp
index e3fe8da8..936fffff 100644
--- a/src/util/spec_sort.cpp
+++ b/src/util/spec_sort.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/spec_sort.hpp>
 #include <util/error.hpp>
 
diff --git a/src/util/tagged_string.cpp b/src/util/tagged_string.cpp
index 584aaf88..94ca1102 100644
--- a/src/util/tagged_string.cpp
+++ b/src/util/tagged_string.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/tagged_string.hpp>
 #include <stack>
 
diff --git a/src/util/version.cpp b/src/util/version.cpp
index 6c241490..0b2e27f3 100644
--- a/src/util/version.cpp
+++ b/src/util/version.cpp
@@ -6,6 +6,7 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+#include <util/prec.hpp>
 #include <util/version.hpp>
 #include <util/reflect.hpp>
 
diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp
index 147509e6..08334fa5 100644
--- a/src/util/window_id.hpp
+++ b/src/util/window_id.hpp
@@ -243,9 +243,6 @@ enum ControlID {
 ,	ID_INSTALL
 ,	ID_UPGRADE
 ,	ID_REMOVE
-	// Don't use wxID_CANCEL because it makes the button look out of place
-,	ID_CANCEL
-,	ID_APPLY
 	// Auto replace window
 ,	ID_USE_AUTO_REPLACE
 ,	ID_ITEM_VALUE
diff --git a/tools/gen.pl b/tools/gen.pl
index ea9fbf3b..62304e46 100644
--- a/tools/gen.pl
+++ b/tools/gen.pl
@@ -18,7 +18,7 @@ close F;
 
 $hpp =~ s/_\r?\n/_$macro\n/g;
 
-$cpp =~ s@<util/prec.hpp>@<$file.hpp>@g;
+$cpp =~ s@<util/prec.hpp>@$&\n#include <$file.hpp>@g;
 
 # write files