diff --git a/src/code_template.cpp b/src/code_template.cpp
index 86173366..b5739f7a 100644
--- a/src/code_template.cpp
+++ b/src/code_template.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/code_template.hpp b/src/code_template.hpp
index d18fcb67..4ecf6378 100644
--- a/src/code_template.hpp
+++ b/src/code_template.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/keyword.cpp b/src/data/action/keyword.cpp
index e9276730..84cfed46 100644
--- a/src/data/action/keyword.cpp
+++ b/src/data/action/keyword.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/keyword.hpp b/src/data/action/keyword.hpp
index 05026772..0a41f1f2 100644
--- a/src/data/action/keyword.hpp
+++ b/src/data/action/keyword.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/set.cpp b/src/data/action/set.cpp
index 0da4564c..7b06a499 100644
--- a/src/data/action/set.cpp
+++ b/src/data/action/set.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/set.hpp b/src/data/action/set.hpp
index 0c4f8de8..7c36110a 100644
--- a/src/data/action/set.hpp
+++ b/src/data/action/set.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/symbol.cpp b/src/data/action/symbol.cpp
index 53a053d9..3cce7b13 100644
--- a/src/data/action/symbol.cpp
+++ b/src/data/action/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/symbol.hpp b/src/data/action/symbol.hpp
index 62876963..49058edc 100644
--- a/src/data/action/symbol.hpp
+++ b/src/data/action/symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/symbol_part.cpp b/src/data/action/symbol_part.cpp
index 2b682f9b..8999d778 100644
--- a/src/data/action/symbol_part.cpp
+++ b/src/data/action/symbol_part.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/symbol_part.hpp b/src/data/action/symbol_part.hpp
index 5b4115f0..1f29927c 100644
--- a/src/data/action/symbol_part.hpp
+++ b/src/data/action/symbol_part.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/value.cpp b/src/data/action/value.cpp
index 1fceaf7e..b66d199e 100644
--- a/src/data/action/value.cpp
+++ b/src/data/action/value.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/action/value.hpp b/src/data/action/value.hpp
index 2ddc32da..d7ad28c0 100644
--- a/src/data/action/value.hpp
+++ b/src/data/action/value.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/card.cpp b/src/data/card.cpp
index 6c01b41b..9de1af4e 100644
--- a/src/data/card.cpp
+++ b/src/data/card.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/card.hpp b/src/data/card.hpp
index f619d134..26f3afbe 100644
--- a/src/data/card.hpp
+++ b/src/data/card.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/export_template.cpp b/src/data/export_template.cpp
index 39dba481..2b811cba 100644
--- a/src/data/export_template.cpp
+++ b/src/data/export_template.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/export_template.hpp b/src/data/export_template.hpp
index 5c23562a..ca44807f 100644
--- a/src/data/export_template.hpp
+++ b/src/data/export_template.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field.cpp b/src/data/field.cpp
index df85e8cb..47bcf80e 100644
--- a/src/data/field.cpp
+++ b/src/data/field.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field.hpp b/src/data/field.hpp
index 2071b465..98d9330e 100644
--- a/src/data/field.hpp
+++ b/src/data/field.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/boolean.cpp b/src/data/field/boolean.cpp
index 87654279..03b148a9 100644
--- a/src/data/field/boolean.cpp
+++ b/src/data/field/boolean.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/boolean.hpp b/src/data/field/boolean.hpp
index b9cde89a..adb3a0a3 100644
--- a/src/data/field/boolean.hpp
+++ b/src/data/field/boolean.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/choice.cpp b/src/data/field/choice.cpp
index e2a942cd..b72dd5a8 100644
--- a/src/data/field/choice.cpp
+++ b/src/data/field/choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/choice.hpp b/src/data/field/choice.hpp
index 91f5f9b0..a8743e5c 100644
--- a/src/data/field/choice.hpp
+++ b/src/data/field/choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/color.cpp b/src/data/field/color.cpp
index 839ec42a..9cf21dd8 100644
--- a/src/data/field/color.cpp
+++ b/src/data/field/color.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/color.hpp b/src/data/field/color.hpp
index 37ed4f38..e30533ba 100644
--- a/src/data/field/color.hpp
+++ b/src/data/field/color.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/image.cpp b/src/data/field/image.cpp
index ee13b56c..3d37e8b8 100644
--- a/src/data/field/image.cpp
+++ b/src/data/field/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/image.hpp b/src/data/field/image.hpp
index 8f960f38..2ffede3a 100644
--- a/src/data/field/image.hpp
+++ b/src/data/field/image.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/information.cpp b/src/data/field/information.cpp
index a6b355e9..78e0c9dc 100644
--- a/src/data/field/information.cpp
+++ b/src/data/field/information.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/information.hpp b/src/data/field/information.hpp
index 49c34ccd..410e412d 100644
--- a/src/data/field/information.hpp
+++ b/src/data/field/information.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/multiple_choice.cpp b/src/data/field/multiple_choice.cpp
index e2607a5b..8a668b41 100644
--- a/src/data/field/multiple_choice.cpp
+++ b/src/data/field/multiple_choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/multiple_choice.hpp b/src/data/field/multiple_choice.hpp
index f26eb96a..fdae7edf 100644
--- a/src/data/field/multiple_choice.hpp
+++ b/src/data/field/multiple_choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/symbol.cpp b/src/data/field/symbol.cpp
index 98a9cc1c..615da830 100644
--- a/src/data/field/symbol.cpp
+++ b/src/data/field/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/symbol.hpp b/src/data/field/symbol.hpp
index 27d97e19..2e638890 100644
--- a/src/data/field/symbol.hpp
+++ b/src/data/field/symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/field/text.cpp b/src/data/field/text.cpp
index 970ce3ad..459b3c39 100644
--- a/src/data/field/text.cpp
+++ b/src/data/field/text.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
@@ -66,6 +66,12 @@ void TextStyle::initDependencies(Context& ctx, const Dependency& dep) const {
 //	symbol_font.initDependencies(ctx, dep);
 }
 
+IMPLEMENT_REFLECTION(TextBackground) {
+	REFLECT(image);
+	REFLECT_N("displacement_x", displacement.width);
+	REFLECT_N("displacement_y", displacement.height);
+}
+
 IMPLEMENT_REFLECTION(TextStyle) {
 	REFLECT_BASE(Style);
 	REFLECT(font);
@@ -87,6 +93,9 @@ IMPLEMENT_REFLECTION(TextStyle) {
 	REFLECT(line_height_line);
 	REFLECT_N("mask", mask_filename);
 	REFLECT(direction);
+	REFLECT(text_background);
+	REFLECT(text_background_left);
+	REFLECT(text_background_right);
 }
 
 // ----------------------------------------------------------------------------- : TextValue
diff --git a/src/data/field/text.hpp b/src/data/field/text.hpp
index 6a2a73b7..2d058917 100644
--- a/src/data/field/text.hpp
+++ b/src/data/field/text.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
@@ -17,6 +17,7 @@
 #include <data/font.hpp>
 #include <data/symbol_font.hpp>
 #include <script/scriptable.hpp>
+#include <script/image.hpp>
 #include <gfx/gfx.hpp>
 
 // ----------------------------------------------------------------------------- : TextField
@@ -24,6 +25,7 @@
 DECLARE_POINTER_TYPE(TextField);
 DECLARE_POINTER_TYPE(TextStyle);
 DECLARE_POINTER_TYPE(TextValue);
+DECLARE_POINTER_TYPE(TextBackground);
 
 /// A field for values containing tagged text
 class TextField : public Field {
@@ -45,6 +47,15 @@ class TextField : public Field {
 
 // ----------------------------------------------------------------------------- : TextStyle
 
+/// Background behind text
+class TextBackground {
+  public:
+	ScriptableImage image;        ///< background image, stretched to text size
+	RealSize        displacement;
+  private:
+	DECLARE_REFLECTION();
+};
+
 /// The Style for a TextField
 class TextStyle : public Style {
   public:
@@ -67,6 +78,8 @@ class TextStyle : public Style {
 	String mask_filename;						///< Filename of the mask
 	ContourMask mask;							///< Mask to fit the text to (may be null)
 	Direction direction;						///< In what direction is text layed out?
+	TextBackgroundP text_background;			///< Image behind the text
+	TextBackgroundP text_background_left, text_background_right;
 	
 	virtual bool update(Context&);
 	virtual void initDependencies(Context&, const Dependency&) const;
diff --git a/src/data/font.cpp b/src/data/font.cpp
index a3a21bdd..a83f01c0 100644
--- a/src/data/font.cpp
+++ b/src/data/font.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/font.hpp b/src/data/font.hpp
index bdb18860..45bcaee4 100644
--- a/src/data/font.hpp
+++ b/src/data/font.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/apprentice.cpp b/src/data/format/apprentice.cpp
index 0361fd16..16f6480a 100644
--- a/src/data/format/apprentice.cpp
+++ b/src/data/format/apprentice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/clipboard.cpp b/src/data/format/clipboard.cpp
index 14d2b4b9..059212e1 100644
--- a/src/data/format/clipboard.cpp
+++ b/src/data/format/clipboard.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/clipboard.hpp b/src/data/format/clipboard.hpp
index a97bbeb2..06e09bcc 100644
--- a/src/data/format/clipboard.hpp
+++ b/src/data/format/clipboard.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/formats.cpp b/src/data/format/formats.cpp
index e42a13d2..3e9399f0 100644
--- a/src/data/format/formats.cpp
+++ b/src/data/format/formats.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/formats.hpp b/src/data/format/formats.hpp
index 5e23827b..1572094f 100644
--- a/src/data/format/formats.hpp
+++ b/src/data/format/formats.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/html.cpp b/src/data/format/html.cpp
index 5e85f472..b091b689 100644
--- a/src/data/format/html.cpp
+++ b/src/data/format/html.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/image.cpp b/src/data/format/image.cpp
index 53cbf314..162d8e94 100644
--- a/src/data/format/image.cpp
+++ b/src/data/format/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/image_to_symbol.cpp b/src/data/format/image_to_symbol.cpp
index d457eb36..fa0b98d2 100644
--- a/src/data/format/image_to_symbol.cpp
+++ b/src/data/format/image_to_symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/image_to_symbol.hpp b/src/data/format/image_to_symbol.hpp
index ca4137e1..f47e3179 100644
--- a/src/data/format/image_to_symbol.hpp
+++ b/src/data/format/image_to_symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/mse1.cpp b/src/data/format/mse1.cpp
index f8562a16..3b315bac 100644
--- a/src/data/format/mse1.cpp
+++ b/src/data/format/mse1.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/mse2.cpp b/src/data/format/mse2.cpp
index 49b52265..24e5dbbd 100644
--- a/src/data/format/mse2.cpp
+++ b/src/data/format/mse2.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/mtg_editor.cpp b/src/data/format/mtg_editor.cpp
index e8f7428f..18413f9f 100644
--- a/src/data/format/mtg_editor.cpp
+++ b/src/data/format/mtg_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/format/mws.cpp b/src/data/format/mws.cpp
index 3a8fc53e..e8922c4e 100644
--- a/src/data/format/mws.cpp
+++ b/src/data/format/mws.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/game.cpp b/src/data/game.cpp
index 063936bd..70ed9fb9 100644
--- a/src/data/game.cpp
+++ b/src/data/game.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/game.hpp b/src/data/game.hpp
index 04f61e19..2102de65 100644
--- a/src/data/game.hpp
+++ b/src/data/game.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/keyword.cpp b/src/data/keyword.cpp
index f9ae6a70..70ba1dcb 100644
--- a/src/data/keyword.cpp
+++ b/src/data/keyword.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/keyword.hpp b/src/data/keyword.hpp
index 0201bdf6..5762bacb 100644
--- a/src/data/keyword.hpp
+++ b/src/data/keyword.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
@@ -80,6 +80,7 @@ class Keyword {
 	 */
 	wxRegEx               matchRe;
 	bool                  fixed;		///< Is this keyword uneditable? (true for game keywods, false for set keywords)
+	bool                  valid;		///< Is this keyword okay (reminder text compiles & runs; match does not match "")
 	
 	/// Find the index of the mode in a list of possibilities.
 	/** Returns the default if not found and 0 if there is no default */
diff --git a/src/data/locale.cpp b/src/data/locale.cpp
index 252ee998..5d5284b0 100644
--- a/src/data/locale.cpp
+++ b/src/data/locale.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/locale.hpp b/src/data/locale.hpp
index 3da9dd3c..73660c06 100644
--- a/src/data/locale.hpp
+++ b/src/data/locale.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/set.cpp b/src/data/set.cpp
index 297588b7..ebf2552f 100644
--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/set.hpp b/src/data/set.hpp
index 4009a9da..000a8e85 100644
--- a/src/data/set.hpp
+++ b/src/data/set.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/settings.cpp b/src/data/settings.cpp
index 332f24ab..15a2e9f2 100644
--- a/src/data/settings.cpp
+++ b/src/data/settings.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/settings.hpp b/src/data/settings.hpp
index 79536895..844708f0 100644
--- a/src/data/settings.hpp
+++ b/src/data/settings.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/statistics.cpp b/src/data/statistics.cpp
index bc8bc243..c3840021 100644
--- a/src/data/statistics.cpp
+++ b/src/data/statistics.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/statistics.hpp b/src/data/statistics.hpp
index c0cfa563..f5a9219c 100644
--- a/src/data/statistics.hpp
+++ b/src/data/statistics.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/stylesheet.cpp b/src/data/stylesheet.cpp
index 81a5182f..f561ea99 100644
--- a/src/data/stylesheet.cpp
+++ b/src/data/stylesheet.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/stylesheet.hpp b/src/data/stylesheet.hpp
index 58c8f97e..e1f08727 100644
--- a/src/data/stylesheet.hpp
+++ b/src/data/stylesheet.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/symbol.cpp b/src/data/symbol.cpp
index 92f1a84d..9cb6782d 100644
--- a/src/data/symbol.cpp
+++ b/src/data/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/symbol.hpp b/src/data/symbol.hpp
index f40b27d9..f98e7ed2 100644
--- a/src/data/symbol.hpp
+++ b/src/data/symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp
index 924e08d9..1914fbdc 100644
--- a/src/data/symbol_font.cpp
+++ b/src/data/symbol_font.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/data/symbol_font.hpp b/src/data/symbol_font.hpp
index e07d7ee5..812b7cd2 100644
--- a/src/data/symbol_font.hpp
+++ b/src/data/symbol_font.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/bezier.cpp b/src/gfx/bezier.cpp
index e7d0d63c..1e1270af 100644
--- a/src/gfx/bezier.cpp
+++ b/src/gfx/bezier.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/bezier.hpp b/src/gfx/bezier.hpp
index ba15c270..383d68ad 100644
--- a/src/gfx/bezier.hpp
+++ b/src/gfx/bezier.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/blend_image.cpp b/src/gfx/blend_image.cpp
index b4353727..37c84a71 100644
--- a/src/gfx/blend_image.cpp
+++ b/src/gfx/blend_image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/color.cpp b/src/gfx/color.cpp
index 39db4558..ec08d7b6 100644
--- a/src/gfx/color.cpp
+++ b/src/gfx/color.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/combine_image.cpp b/src/gfx/combine_image.cpp
index e347d3ef..f083a70d 100644
--- a/src/gfx/combine_image.cpp
+++ b/src/gfx/combine_image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/gfx.hpp b/src/gfx/gfx.hpp
index c85ded24..1060d243 100644
--- a/src/gfx/gfx.hpp
+++ b/src/gfx/gfx.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/image_effects.cpp b/src/gfx/image_effects.cpp
index 51cf3c9f..fb452831 100644
--- a/src/gfx/image_effects.cpp
+++ b/src/gfx/image_effects.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/mask_image.cpp b/src/gfx/mask_image.cpp
index 618419cb..af456462 100644
--- a/src/gfx/mask_image.cpp
+++ b/src/gfx/mask_image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/polynomial.cpp b/src/gfx/polynomial.cpp
index 974aefa3..f136613f 100644
--- a/src/gfx/polynomial.cpp
+++ b/src/gfx/polynomial.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/polynomial.hpp b/src/gfx/polynomial.hpp
index 78822326..3e5f7a85 100644
--- a/src/gfx/polynomial.hpp
+++ b/src/gfx/polynomial.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/resample_image.cpp b/src/gfx/resample_image.cpp
index 014dc527..c6656302 100644
--- a/src/gfx/resample_image.cpp
+++ b/src/gfx/resample_image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/resample_text.cpp b/src/gfx/resample_text.cpp
index 8d943ff3..4a6163f8 100644
--- a/src/gfx/resample_text.cpp
+++ b/src/gfx/resample_text.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gfx/rotate_image.cpp b/src/gfx/rotate_image.cpp
index de7d4a7c..9d5cbad9 100644
--- a/src/gfx/rotate_image.cpp
+++ b/src/gfx/rotate_image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp
index c3362ce3..810ce300 100644
--- a/src/gui/about_window.cpp
+++ b/src/gui/about_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
@@ -53,7 +53,7 @@ void AboutWindow::draw(DC& dc) {
 	dc.DrawText(_("   it probably contains lots bugs,"), 34, 147);
 	dc.DrawText(_("   it misses some very important features,"), 34, 164);
 	dc.DrawText(_("   don't use it for anything important"), 34, 181);
-	dc.DrawText(_("Copyright \xA9 2006 Twan van Laarhoven"), 34, 214);
+	dc.DrawText(_("Copyright \xA9 2007 Twan van Laarhoven"), 34, 214);
 }
 
 BEGIN_EVENT_TABLE(AboutWindow, wxDialog)
diff --git a/src/gui/about_window.hpp b/src/gui/about_window.hpp
index 919856de..13430da7 100644
--- a/src/gui/about_window.hpp
+++ b/src/gui/about_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/card_select_window.cpp b/src/gui/card_select_window.cpp
index 4c65613e..b635fe41 100644
--- a/src/gui/card_select_window.cpp
+++ b/src/gui/card_select_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/card_select_window.hpp b/src/gui/card_select_window.hpp
index 05eaeaeb..87c5b080 100644
--- a/src/gui/card_select_window.hpp
+++ b/src/gui/card_select_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_editor.cpp b/src/gui/control/card_editor.cpp
index 1d564249..116914fd 100644
--- a/src/gui/control/card_editor.cpp
+++ b/src/gui/control/card_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_editor.hpp b/src/gui/control/card_editor.hpp
index cb934a5f..328831b0 100644
--- a/src/gui/control/card_editor.hpp
+++ b/src/gui/control/card_editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_list.cpp b/src/gui/control/card_list.cpp
index 3dacc134..c07cb668 100644
--- a/src/gui/control/card_list.cpp
+++ b/src/gui/control/card_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_list.hpp b/src/gui/control/card_list.hpp
index ef3d09e7..44ba8b5a 100644
--- a/src/gui/control/card_list.hpp
+++ b/src/gui/control/card_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_list_column_select.cpp b/src/gui/control/card_list_column_select.cpp
index be984875..d54f8f9d 100644
--- a/src/gui/control/card_list_column_select.cpp
+++ b/src/gui/control/card_list_column_select.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_list_column_select.hpp b/src/gui/control/card_list_column_select.hpp
index 468d5062..3042856a 100644
--- a/src/gui/control/card_list_column_select.hpp
+++ b/src/gui/control/card_list_column_select.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_viewer.cpp b/src/gui/control/card_viewer.cpp
index 01ebc9cc..6da17ace 100644
--- a/src/gui/control/card_viewer.cpp
+++ b/src/gui/control/card_viewer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/card_viewer.hpp b/src/gui/control/card_viewer.hpp
index 94ea3909..486adb56 100644
--- a/src/gui/control/card_viewer.hpp
+++ b/src/gui/control/card_viewer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/filtered_card_list.cpp b/src/gui/control/filtered_card_list.cpp
index b025c647..90451116 100644
--- a/src/gui/control/filtered_card_list.cpp
+++ b/src/gui/control/filtered_card_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/filtered_card_list.hpp b/src/gui/control/filtered_card_list.hpp
index acbdac53..7da7ad64 100644
--- a/src/gui/control/filtered_card_list.hpp
+++ b/src/gui/control/filtered_card_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/gallery_list.cpp b/src/gui/control/gallery_list.cpp
index f940340a..84663bd6 100644
--- a/src/gui/control/gallery_list.cpp
+++ b/src/gui/control/gallery_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/gallery_list.hpp b/src/gui/control/gallery_list.hpp
index 35b70910..707bd85f 100644
--- a/src/gui/control/gallery_list.hpp
+++ b/src/gui/control/gallery_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index 01eec494..d47a555d 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/graph.hpp b/src/gui/control/graph.hpp
index fa39a352..c88816be 100644
--- a/src/gui/control/graph.hpp
+++ b/src/gui/control/graph.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/image_card_list.cpp b/src/gui/control/image_card_list.cpp
index 14bc6cc9..3023b6cf 100644
--- a/src/gui/control/image_card_list.cpp
+++ b/src/gui/control/image_card_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/image_card_list.hpp b/src/gui/control/image_card_list.hpp
index 0cd5004a..429b98fd 100644
--- a/src/gui/control/image_card_list.hpp
+++ b/src/gui/control/image_card_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/item_list.cpp b/src/gui/control/item_list.cpp
index cc4ebbe5..0ea08d7c 100644
--- a/src/gui/control/item_list.cpp
+++ b/src/gui/control/item_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/item_list.hpp b/src/gui/control/item_list.hpp
index 401e9437..b465c0cb 100644
--- a/src/gui/control/item_list.hpp
+++ b/src/gui/control/item_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/keyword_list.cpp b/src/gui/control/keyword_list.cpp
index d0ae1ac5..dbaae30c 100644
--- a/src/gui/control/keyword_list.cpp
+++ b/src/gui/control/keyword_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/keyword_list.hpp b/src/gui/control/keyword_list.hpp
index 09168d86..53cf1cbb 100644
--- a/src/gui/control/keyword_list.hpp
+++ b/src/gui/control/keyword_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/native_look_editor.cpp b/src/gui/control/native_look_editor.cpp
index 91b63f8f..aa9c3621 100644
--- a/src/gui/control/native_look_editor.cpp
+++ b/src/gui/control/native_look_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/native_look_editor.hpp b/src/gui/control/native_look_editor.hpp
index a1a90d71..3c1f9d11 100644
--- a/src/gui/control/native_look_editor.hpp
+++ b/src/gui/control/native_look_editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp
index b8029e78..ae5aeab2 100644
--- a/src/gui/control/package_list.cpp
+++ b/src/gui/control/package_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/package_list.hpp b/src/gui/control/package_list.hpp
index 2057976b..73169c23 100644
--- a/src/gui/control/package_list.hpp
+++ b/src/gui/control/package_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/select_card_list.cpp b/src/gui/control/select_card_list.cpp
index a97e5d7c..4b56598e 100644
--- a/src/gui/control/select_card_list.cpp
+++ b/src/gui/control/select_card_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/select_card_list.hpp b/src/gui/control/select_card_list.hpp
index fdcbd758..5b1606bb 100644
--- a/src/gui/control/select_card_list.hpp
+++ b/src/gui/control/select_card_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/text_ctrl.cpp b/src/gui/control/text_ctrl.cpp
index 7c9e36d2..6b47690a 100644
--- a/src/gui/control/text_ctrl.cpp
+++ b/src/gui/control/text_ctrl.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/control/text_ctrl.hpp b/src/gui/control/text_ctrl.hpp
index 9952b739..d5f04227 100644
--- a/src/gui/control/text_ctrl.hpp
+++ b/src/gui/control/text_ctrl.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/drop_down_list.cpp b/src/gui/drop_down_list.cpp
index 33a16b0c..bb355003 100644
--- a/src/gui/drop_down_list.cpp
+++ b/src/gui/drop_down_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/drop_down_list.hpp b/src/gui/drop_down_list.hpp
index 6a38b840..f961d93a 100644
--- a/src/gui/drop_down_list.hpp
+++ b/src/gui/drop_down_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/icon_menu.cpp b/src/gui/icon_menu.cpp
index 67cfd86a..27ddec76 100644
--- a/src/gui/icon_menu.cpp
+++ b/src/gui/icon_menu.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/icon_menu.hpp b/src/gui/icon_menu.hpp
index 23d09657..722d72eb 100644
--- a/src/gui/icon_menu.hpp
+++ b/src/gui/icon_menu.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index a920c664..33dd1d1f 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/image_slice_window.hpp b/src/gui/image_slice_window.hpp
index 13fc72fd..eb60c692 100644
--- a/src/gui/image_slice_window.hpp
+++ b/src/gui/image_slice_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/images_export_window.cpp b/src/gui/images_export_window.cpp
index 3c931403..27402003 100644
--- a/src/gui/images_export_window.cpp
+++ b/src/gui/images_export_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/images_export_window.hpp b/src/gui/images_export_window.hpp
index 2d5579a4..90506010 100644
--- a/src/gui/images_export_window.hpp
+++ b/src/gui/images_export_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/new_window.cpp b/src/gui/new_window.cpp
index d22aa541..19d7d982 100644
--- a/src/gui/new_window.cpp
+++ b/src/gui/new_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/new_window.hpp b/src/gui/new_window.hpp
index 9deeea53..2d4c57f8 100644
--- a/src/gui/new_window.hpp
+++ b/src/gui/new_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/preferences_window.cpp b/src/gui/preferences_window.cpp
index 43c47afd..62d1b4d4 100644
--- a/src/gui/preferences_window.cpp
+++ b/src/gui/preferences_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/preferences_window.hpp b/src/gui/preferences_window.hpp
index f7677089..8333a7c6 100644
--- a/src/gui/preferences_window.hpp
+++ b/src/gui/preferences_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/print_window.cpp b/src/gui/print_window.cpp
index 4b892cf9..4e70883b 100644
--- a/src/gui/print_window.cpp
+++ b/src/gui/print_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/print_window.hpp b/src/gui/print_window.hpp
index 103cd4f7..ce15449f 100644
--- a/src/gui/print_window.hpp
+++ b/src/gui/print_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/cards_panel.cpp b/src/gui/set/cards_panel.cpp
index e3a9af87..be880a49 100644
--- a/src/gui/set/cards_panel.cpp
+++ b/src/gui/set/cards_panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/cards_panel.hpp b/src/gui/set/cards_panel.hpp
index 8e382076..0fe89f15 100644
--- a/src/gui/set/cards_panel.hpp
+++ b/src/gui/set/cards_panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/keywords_panel.cpp b/src/gui/set/keywords_panel.cpp
index 96787f71..3a3796ee 100644
--- a/src/gui/set/keywords_panel.cpp
+++ b/src/gui/set/keywords_panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/keywords_panel.hpp b/src/gui/set/keywords_panel.hpp
index bae10d48..7f4d46b6 100644
--- a/src/gui/set/keywords_panel.hpp
+++ b/src/gui/set/keywords_panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/panel.cpp b/src/gui/set/panel.cpp
index 72af32bc..206e08ba 100644
--- a/src/gui/set/panel.cpp
+++ b/src/gui/set/panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/panel.hpp b/src/gui/set/panel.hpp
index 7331856b..038d9afa 100644
--- a/src/gui/set/panel.hpp
+++ b/src/gui/set/panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/set_info_panel.cpp b/src/gui/set/set_info_panel.cpp
index d6743005..2e3a56fa 100644
--- a/src/gui/set/set_info_panel.cpp
+++ b/src/gui/set/set_info_panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/set_info_panel.hpp b/src/gui/set/set_info_panel.hpp
index d7578646..c18e9392 100644
--- a/src/gui/set/set_info_panel.hpp
+++ b/src/gui/set/set_info_panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/stats_panel.cpp b/src/gui/set/stats_panel.cpp
index 609bacf2..83e971e5 100644
--- a/src/gui/set/stats_panel.cpp
+++ b/src/gui/set/stats_panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/stats_panel.hpp b/src/gui/set/stats_panel.hpp
index b9114a66..03f445e7 100644
--- a/src/gui/set/stats_panel.hpp
+++ b/src/gui/set/stats_panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/style_panel.cpp b/src/gui/set/style_panel.cpp
index 53185bd2..6a3e4b8d 100644
--- a/src/gui/set/style_panel.cpp
+++ b/src/gui/set/style_panel.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/style_panel.hpp b/src/gui/set/style_panel.hpp
index e2ac871b..8fc769a6 100644
--- a/src/gui/set/style_panel.hpp
+++ b/src/gui/set/style_panel.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp
index fa431d7d..5207fd62 100644
--- a/src/gui/set/window.cpp
+++ b/src/gui/set/window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/set/window.hpp b/src/gui/set/window.hpp
index 4cbc8289..82a78c42 100644
--- a/src/gui/set/window.hpp
+++ b/src/gui/set/window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/basic_shape_editor.cpp b/src/gui/symbol/basic_shape_editor.cpp
index 6399aa5d..38c6f490 100644
--- a/src/gui/symbol/basic_shape_editor.cpp
+++ b/src/gui/symbol/basic_shape_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/basic_shape_editor.hpp b/src/gui/symbol/basic_shape_editor.hpp
index 62b9659f..2ba9d62c 100644
--- a/src/gui/symbol/basic_shape_editor.hpp
+++ b/src/gui/symbol/basic_shape_editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/control.cpp b/src/gui/symbol/control.cpp
index cfdeb795..0ed841b0 100644
--- a/src/gui/symbol/control.cpp
+++ b/src/gui/symbol/control.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/control.hpp b/src/gui/symbol/control.hpp
index a3ec80be..7e966661 100644
--- a/src/gui/symbol/control.hpp
+++ b/src/gui/symbol/control.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/editor.cpp b/src/gui/symbol/editor.cpp
index 59922696..cb4d91b4 100644
--- a/src/gui/symbol/editor.cpp
+++ b/src/gui/symbol/editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/editor.hpp b/src/gui/symbol/editor.hpp
index 9a5c4cce..7eca6c37 100644
--- a/src/gui/symbol/editor.hpp
+++ b/src/gui/symbol/editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/part_list.cpp b/src/gui/symbol/part_list.cpp
index e19e602f..4d05a8e1 100644
--- a/src/gui/symbol/part_list.cpp
+++ b/src/gui/symbol/part_list.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/part_list.hpp b/src/gui/symbol/part_list.hpp
index 05b45c60..10b571f4 100644
--- a/src/gui/symbol/part_list.hpp
+++ b/src/gui/symbol/part_list.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/point_editor.cpp b/src/gui/symbol/point_editor.cpp
index 3e78068f..66a265dc 100644
--- a/src/gui/symbol/point_editor.cpp
+++ b/src/gui/symbol/point_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/point_editor.hpp b/src/gui/symbol/point_editor.hpp
index cfd1bb71..7407652a 100644
--- a/src/gui/symbol/point_editor.hpp
+++ b/src/gui/symbol/point_editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/select_editor.cpp b/src/gui/symbol/select_editor.cpp
index 78ad9733..c07cb672 100644
--- a/src/gui/symbol/select_editor.cpp
+++ b/src/gui/symbol/select_editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/select_editor.hpp b/src/gui/symbol/select_editor.hpp
index e32c281d..ac4e23ee 100644
--- a/src/gui/symbol/select_editor.hpp
+++ b/src/gui/symbol/select_editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/window.cpp b/src/gui/symbol/window.cpp
index 2634b7b0..619dcd9a 100644
--- a/src/gui/symbol/window.cpp
+++ b/src/gui/symbol/window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/symbol/window.hpp b/src/gui/symbol/window.hpp
index 74ea6f39..38fcd2ba 100644
--- a/src/gui/symbol/window.hpp
+++ b/src/gui/symbol/window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/thumbnail_thread.cpp b/src/gui/thumbnail_thread.cpp
index de3a8cdc..806f5395 100644
--- a/src/gui/thumbnail_thread.cpp
+++ b/src/gui/thumbnail_thread.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/thumbnail_thread.hpp b/src/gui/thumbnail_thread.hpp
index 5f9822b3..9e2bb4fa 100644
--- a/src/gui/thumbnail_thread.hpp
+++ b/src/gui/thumbnail_thread.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp
index e641a22c..255a8619 100644
--- a/src/gui/update_checker.cpp
+++ b/src/gui/update_checker.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/update_checker.hpp b/src/gui/update_checker.hpp
index cc4e7eec..92b2bad1 100644
--- a/src/gui/update_checker.hpp
+++ b/src/gui/update_checker.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/util.cpp b/src/gui/util.cpp
index 02c9d73c..27d57603 100644
--- a/src/gui/util.cpp
+++ b/src/gui/util.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/util.hpp b/src/gui/util.hpp
index 36c9dce4..56ec49c4 100644
--- a/src/gui/util.hpp
+++ b/src/gui/util.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index 2ad40076..12f8464b 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/choice.hpp b/src/gui/value/choice.hpp
index 05ec79a0..6c9e1b48 100644
--- a/src/gui/value/choice.hpp
+++ b/src/gui/value/choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/color.cpp b/src/gui/value/color.cpp
index 7bd7e8fa..28d409cb 100644
--- a/src/gui/value/color.cpp
+++ b/src/gui/value/color.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/color.hpp b/src/gui/value/color.hpp
index 6cdd4486..03196327 100644
--- a/src/gui/value/color.hpp
+++ b/src/gui/value/color.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/editor.cpp b/src/gui/value/editor.cpp
index 2430c3d5..9c70cfc4 100644
--- a/src/gui/value/editor.cpp
+++ b/src/gui/value/editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/editor.hpp b/src/gui/value/editor.hpp
index 997a1637..c90d8a30 100644
--- a/src/gui/value/editor.hpp
+++ b/src/gui/value/editor.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/image.cpp b/src/gui/value/image.cpp
index 35415ba9..6c4a2d39 100644
--- a/src/gui/value/image.cpp
+++ b/src/gui/value/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/image.hpp b/src/gui/value/image.hpp
index ba0efd59..60f6aa9a 100644
--- a/src/gui/value/image.hpp
+++ b/src/gui/value/image.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/information.cpp b/src/gui/value/information.cpp
index e6af5801..d4cf1b45 100644
--- a/src/gui/value/information.cpp
+++ b/src/gui/value/information.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/information.hpp b/src/gui/value/information.hpp
index 13c55a35..ef1cb0ad 100644
--- a/src/gui/value/information.hpp
+++ b/src/gui/value/information.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/multiple_choice.cpp b/src/gui/value/multiple_choice.cpp
index 0b7f48d0..cff97951 100644
--- a/src/gui/value/multiple_choice.cpp
+++ b/src/gui/value/multiple_choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/multiple_choice.hpp b/src/gui/value/multiple_choice.hpp
index bb72f91b..f5a7609d 100644
--- a/src/gui/value/multiple_choice.hpp
+++ b/src/gui/value/multiple_choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/symbol.cpp b/src/gui/value/symbol.cpp
index 8cc58926..f2a65bcf 100644
--- a/src/gui/value/symbol.cpp
+++ b/src/gui/value/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/symbol.hpp b/src/gui/value/symbol.hpp
index 284e0bf1..817b09a0 100644
--- a/src/gui/value/symbol.hpp
+++ b/src/gui/value/symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/text.cpp b/src/gui/value/text.cpp
index ac1a3ca4..123196b3 100644
--- a/src/gui/value/text.cpp
+++ b/src/gui/value/text.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/value/text.hpp b/src/gui/value/text.hpp
index 6e0eb2aa..69968170 100644
--- a/src/gui/value/text.hpp
+++ b/src/gui/value/text.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp
index acc3c0ca..abfb8579 100644
--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/gui/welcome_window.hpp b/src/gui/welcome_window.hpp
index c4797139..91c46659 100644
--- a/src/gui/welcome_window.hpp
+++ b/src/gui/welcome_window.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/main.cpp b/src/main.cpp
index 6cb3beb0..cc6dcd19 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/mse.vcproj b/src/mse.vcproj
index 4b629202..ae055211 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -2930,10 +2930,10 @@
 			RelativePath="..\conversion-todo.txt">
 		</File>
 		<File
-			RelativePath="..\data\nl.mse-locale\locale">
+			RelativePath="..\data\en.mse-locale\locale">
 		</File>
 		<File
-			RelativePath="..\data\en.mse-locale\locale">
+			RelativePath="..\data\nl.mse-locale\locale">
 		</File>
 		<File
 			RelativePath=".\main.cpp">
diff --git a/src/render/card/viewer.cpp b/src/render/card/viewer.cpp
index b2431337..dc59abc7 100644
--- a/src/render/card/viewer.cpp
+++ b/src/render/card/viewer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/card/viewer.hpp b/src/render/card/viewer.hpp
index 89556a81..50c85adb 100644
--- a/src/render/card/viewer.hpp
+++ b/src/render/card/viewer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/symbol/filter.cpp b/src/render/symbol/filter.cpp
index a79eb184..d49c6fdc 100644
--- a/src/render/symbol/filter.cpp
+++ b/src/render/symbol/filter.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/symbol/filter.hpp b/src/render/symbol/filter.hpp
index 7c731aed..dee9f55e 100644
--- a/src/render/symbol/filter.hpp
+++ b/src/render/symbol/filter.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/symbol/viewer.cpp b/src/render/symbol/viewer.cpp
index 27180ca6..e753212b 100644
--- a/src/render/symbol/viewer.cpp
+++ b/src/render/symbol/viewer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/symbol/viewer.hpp b/src/render/symbol/viewer.hpp
index d748190b..a0091022 100644
--- a/src/render/symbol/viewer.hpp
+++ b/src/render/symbol/viewer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/compound.cpp b/src/render/text/compound.cpp
index daffa750..bb3c9950 100644
--- a/src/render/text/compound.cpp
+++ b/src/render/text/compound.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/element.cpp b/src/render/text/element.cpp
index 895eb987..9c8e8ff3 100644
--- a/src/render/text/element.cpp
+++ b/src/render/text/element.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/element.hpp b/src/render/text/element.hpp
index b20953f1..5156c5f6 100644
--- a/src/render/text/element.hpp
+++ b/src/render/text/element.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/font.cpp b/src/render/text/font.cpp
index c5272a5a..16473a78 100644
--- a/src/render/text/font.cpp
+++ b/src/render/text/font.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/symbol.cpp b/src/render/text/symbol.cpp
index bdee8795..7240587a 100644
--- a/src/render/text/symbol.cpp
+++ b/src/render/text/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/viewer.cpp b/src/render/text/viewer.cpp
index 02e585f4..423b15ba 100644
--- a/src/render/text/viewer.cpp
+++ b/src/render/text/viewer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/text/viewer.hpp b/src/render/text/viewer.hpp
index 2ba19ba2..b1a0a885 100644
--- a/src/render/text/viewer.hpp
+++ b/src/render/text/viewer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/choice.cpp b/src/render/value/choice.cpp
index 33facb64..9dc78a4a 100644
--- a/src/render/value/choice.cpp
+++ b/src/render/value/choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/choice.hpp b/src/render/value/choice.hpp
index 8c71b9c9..edd1a02c 100644
--- a/src/render/value/choice.hpp
+++ b/src/render/value/choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/color.cpp b/src/render/value/color.cpp
index 3ed536dc..9911477b 100644
--- a/src/render/value/color.cpp
+++ b/src/render/value/color.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/color.hpp b/src/render/value/color.hpp
index 307efa75..b168e008 100644
--- a/src/render/value/color.hpp
+++ b/src/render/value/color.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/image.cpp b/src/render/value/image.cpp
index a978c2db..107ab012 100644
--- a/src/render/value/image.cpp
+++ b/src/render/value/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/image.hpp b/src/render/value/image.hpp
index 7426c27c..ae9aeaa3 100644
--- a/src/render/value/image.hpp
+++ b/src/render/value/image.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/information.cpp b/src/render/value/information.cpp
index c07c1dec..833e6813 100644
--- a/src/render/value/information.cpp
+++ b/src/render/value/information.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/information.hpp b/src/render/value/information.hpp
index e6d97d0d..4046a2cf 100644
--- a/src/render/value/information.hpp
+++ b/src/render/value/information.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/multiple_choice.cpp b/src/render/value/multiple_choice.cpp
index 9e5e4203..2b6f266d 100644
--- a/src/render/value/multiple_choice.cpp
+++ b/src/render/value/multiple_choice.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/multiple_choice.hpp b/src/render/value/multiple_choice.hpp
index d57ffc87..57bd7a55 100644
--- a/src/render/value/multiple_choice.hpp
+++ b/src/render/value/multiple_choice.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/symbol.cpp b/src/render/value/symbol.cpp
index ef6cae2d..2b858257 100644
--- a/src/render/value/symbol.cpp
+++ b/src/render/value/symbol.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/symbol.hpp b/src/render/value/symbol.hpp
index 7d93a27c..d3c03038 100644
--- a/src/render/value/symbol.hpp
+++ b/src/render/value/symbol.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/text.cpp b/src/render/value/text.cpp
index ce3cc569..1b546cfb 100644
--- a/src/render/value/text.cpp
+++ b/src/render/value/text.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/text.hpp b/src/render/value/text.hpp
index 55d708f0..8e92bc24 100644
--- a/src/render/value/text.hpp
+++ b/src/render/value/text.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/viewer.cpp b/src/render/value/viewer.cpp
index 84e3d9c0..621898a8 100644
--- a/src/render/value/viewer.cpp
+++ b/src/render/value/viewer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/render/value/viewer.hpp b/src/render/value/viewer.hpp
index b9c20962..45d1f41a 100644
--- a/src/render/value/viewer.hpp
+++ b/src/render/value/viewer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/resource/msw/mse.rc b/src/resource/msw/mse.rc
index 55645de3..1e363129 100644
--- a/src/resource/msw/mse.rc
+++ b/src/resource/msw/mse.rc
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/context.cpp b/src/script/context.cpp
index 35766c95..9abd29b7 100644
--- a/src/script/context.cpp
+++ b/src/script/context.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/context.hpp b/src/script/context.hpp
index c2d3cffc..6f66321b 100644
--- a/src/script/context.hpp
+++ b/src/script/context.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/dependency.cpp b/src/script/dependency.cpp
index 9215a003..c1cfb393 100644
--- a/src/script/dependency.cpp
+++ b/src/script/dependency.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/dependency.hpp b/src/script/dependency.hpp
index 9aa935c6..3e50b33e 100644
--- a/src/script/dependency.hpp
+++ b/src/script/dependency.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/basic.cpp b/src/script/functions/basic.cpp
index 1c2f9f9d..c4f69ff6 100644
--- a/src/script/functions/basic.cpp
+++ b/src/script/functions/basic.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/editor.cpp b/src/script/functions/editor.cpp
index 20544939..a2bfd2cf 100644
--- a/src/script/functions/editor.cpp
+++ b/src/script/functions/editor.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/english.cpp b/src/script/functions/english.cpp
index b9a20d31..8a228b49 100644
--- a/src/script/functions/english.cpp
+++ b/src/script/functions/english.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/export.cpp b/src/script/functions/export.cpp
index f1a5781b..b8916a64 100644
--- a/src/script/functions/export.cpp
+++ b/src/script/functions/export.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/functions.hpp b/src/script/functions/functions.hpp
index 818de391..77045c80 100644
--- a/src/script/functions/functions.hpp
+++ b/src/script/functions/functions.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/image.cpp b/src/script/functions/image.cpp
index 8e1727f8..f5132fac 100644
--- a/src/script/functions/image.cpp
+++ b/src/script/functions/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/functions/util.hpp b/src/script/functions/util.hpp
index 3fcb3ed5..2459fa07 100644
--- a/src/script/functions/util.hpp
+++ b/src/script/functions/util.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/image.cpp b/src/script/image.cpp
index 242cb461..759554ab 100644
--- a/src/script/image.cpp
+++ b/src/script/image.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/image.hpp b/src/script/image.hpp
index 890c92cd..d54ed2b9 100644
--- a/src/script/image.hpp
+++ b/src/script/image.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/parser.cpp b/src/script/parser.cpp
index 45d40bb5..d2c6f5e0 100644
--- a/src/script/parser.cpp
+++ b/src/script/parser.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/parser.hpp b/src/script/parser.hpp
index 1423f183..f6783db0 100644
--- a/src/script/parser.hpp
+++ b/src/script/parser.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 3113801e..0f6d5a19 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/script.hpp b/src/script/script.hpp
index fb8d5b59..eaee2aee 100644
--- a/src/script/script.hpp
+++ b/src/script/script.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/script_manager.cpp b/src/script/script_manager.cpp
index 37f1fa1f..6291039d 100644
--- a/src/script/script_manager.cpp
+++ b/src/script/script_manager.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/script_manager.hpp b/src/script/script_manager.hpp
index 073d4915..0a0ba5d0 100644
--- a/src/script/script_manager.hpp
+++ b/src/script/script_manager.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/scriptable.cpp b/src/script/scriptable.cpp
index a0e0327b..f576f118 100644
--- a/src/script/scriptable.cpp
+++ b/src/script/scriptable.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/scriptable.hpp b/src/script/scriptable.hpp
index a39880c6..bd90d8ae 100644
--- a/src/script/scriptable.hpp
+++ b/src/script/scriptable.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/to_value.hpp b/src/script/to_value.hpp
index d5d8c2bf..c0d75a2e 100644
--- a/src/script/to_value.hpp
+++ b/src/script/to_value.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/value.cpp b/src/script/value.cpp
index 49cbfd83..9916f07e 100644
--- a/src/script/value.cpp
+++ b/src/script/value.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/script/value.hpp b/src/script/value.hpp
index 078e58e7..f676b5f4 100644
--- a/src/script/value.hpp
+++ b/src/script/value.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/action_stack.cpp b/src/util/action_stack.cpp
index bf3235cb..60532a10 100644
--- a/src/util/action_stack.cpp
+++ b/src/util/action_stack.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/action_stack.hpp b/src/util/action_stack.hpp
index 805efecf..1c824869 100644
--- a/src/util/action_stack.hpp
+++ b/src/util/action_stack.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/age.cpp b/src/util/age.cpp
index abfb5b90..70e0b760 100644
--- a/src/util/age.cpp
+++ b/src/util/age.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/age.hpp b/src/util/age.hpp
index 2209d6cc..b6488776 100644
--- a/src/util/age.hpp
+++ b/src/util/age.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/alignment.cpp b/src/util/alignment.cpp
index 3d5fc208..f37c80ab 100644
--- a/src/util/alignment.cpp
+++ b/src/util/alignment.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/alignment.hpp b/src/util/alignment.hpp
index f897ea76..31e11153 100644
--- a/src/util/alignment.hpp
+++ b/src/util/alignment.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/atomic.hpp b/src/util/atomic.hpp
index b3afb18e..227ec292 100644
--- a/src/util/atomic.hpp
+++ b/src/util/atomic.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/defaultable.hpp b/src/util/defaultable.hpp
index 6a0f0220..a4d78653 100644
--- a/src/util/defaultable.hpp
+++ b/src/util/defaultable.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/dynamic_arg.hpp b/src/util/dynamic_arg.hpp
index 82890616..baef5648 100644
--- a/src/util/dynamic_arg.hpp
+++ b/src/util/dynamic_arg.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 41a6663e..b89af690 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/error.hpp b/src/util/error.hpp
index 31cfb607..571ccb00 100644
--- a/src/util/error.hpp
+++ b/src/util/error.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/for_each.hpp b/src/util/for_each.hpp
index ec235db0..b957a3e9 100644
--- a/src/util/for_each.hpp
+++ b/src/util/for_each.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/index_map.hpp b/src/util/index_map.hpp
index 98feb933..cf07085c 100644
--- a/src/util/index_map.hpp
+++ b/src/util/index_map.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/get_member.cpp b/src/util/io/get_member.cpp
index fef86962..912511ac 100644
--- a/src/util/io/get_member.cpp
+++ b/src/util/io/get_member.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/get_member.hpp b/src/util/io/get_member.hpp
index bbe48d9b..48ef16b6 100644
--- a/src/util/io/get_member.hpp
+++ b/src/util/io/get_member.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp
index 45e2d631..a77848e0 100644
--- a/src/util/io/package.cpp
+++ b/src/util/io/package.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/package.hpp b/src/util/io/package.hpp
index b7db9995..92edb0eb 100644
--- a/src/util/io/package.hpp
+++ b/src/util/io/package.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/package_manager.cpp b/src/util/io/package_manager.cpp
index 4e505b5d..83c62dbb 100644
--- a/src/util/io/package_manager.cpp
+++ b/src/util/io/package_manager.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/package_manager.hpp b/src/util/io/package_manager.hpp
index 340020d6..f2b93a78 100644
--- a/src/util/io/package_manager.hpp
+++ b/src/util/io/package_manager.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index accc813b..3c559fdf 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/reader.hpp b/src/util/io/reader.hpp
index 969c8417..4e98294e 100644
--- a/src/util/io/reader.hpp
+++ b/src/util/io/reader.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/writer.cpp b/src/util/io/writer.cpp
index 2981776c..0905150b 100644
--- a/src/util/io/writer.cpp
+++ b/src/util/io/writer.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/io/writer.hpp b/src/util/io/writer.hpp
index 1ac302ab..6aaa06f8 100644
--- a/src/util/io/writer.hpp
+++ b/src/util/io/writer.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/locale.hpp b/src/util/locale.hpp
index edaef22e..7ccbe0db 100644
--- a/src/util/locale.hpp
+++ b/src/util/locale.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/order_cache.hpp b/src/util/order_cache.hpp
index 5e1f838a..6f25c038 100644
--- a/src/util/order_cache.hpp
+++ b/src/util/order_cache.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/platform.hpp b/src/util/platform.hpp
index 2f3fdb67..7f52ce67 100644
--- a/src/util/platform.hpp
+++ b/src/util/platform.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/prec.hpp b/src/util/prec.hpp
index a46978d1..1b3c45bd 100644
--- a/src/util/prec.hpp
+++ b/src/util/prec.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/real_point.hpp b/src/util/real_point.hpp
index fb452e90..0a410c04 100644
--- a/src/util/real_point.hpp
+++ b/src/util/real_point.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/reflect.hpp b/src/util/reflect.hpp
index f68568ef..f78b412d 100644
--- a/src/util/reflect.hpp
+++ b/src/util/reflect.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp
index 417c9c2a..a7573c6a 100644
--- a/src/util/rotation.cpp
+++ b/src/util/rotation.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/rotation.hpp b/src/util/rotation.hpp
index c8187760..d3c383b1 100644
--- a/src/util/rotation.hpp
+++ b/src/util/rotation.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp
index 4bdc3a93..5e86bd98 100644
--- a/src/util/smart_ptr.hpp
+++ b/src/util/smart_ptr.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 763ca775..715e002d 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/string.hpp b/src/util/string.hpp
index 404c0cde..99df5750 100644
--- a/src/util/string.hpp
+++ b/src/util/string.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/tagged_string.cpp b/src/util/tagged_string.cpp
index ca41dc27..bea0b7b9 100644
--- a/src/util/tagged_string.cpp
+++ b/src/util/tagged_string.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/tagged_string.hpp b/src/util/tagged_string.hpp
index 20cd879f..fb0e33cb 100644
--- a/src/util/tagged_string.hpp
+++ b/src/util/tagged_string.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/vector2d.hpp b/src/util/vector2d.hpp
index 5394bd25..715c51a3 100644
--- a/src/util/vector2d.hpp
+++ b/src/util/vector2d.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/version.cpp b/src/util/version.cpp
index 77332979..29506f05 100644
--- a/src/util/version.cpp
+++ b/src/util/version.cpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/version.hpp b/src/util/version.hpp
index 2452cc33..c7aba6c2 100644
--- a/src/util/version.hpp
+++ b/src/util/version.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp
index b7fd1cc0..53bddca9 100644
--- a/src/util/window_id.hpp
+++ b/src/util/window_id.hpp
@@ -1,6 +1,6 @@
 //+----------------------------------------------------------------------------+
 //| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| Copyright:    (C) 2001 - 2007 Twan van Laarhoven                           |
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+